aboutsummaryrefslogtreecommitdiff
path: root/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
* ImprovementPablo Polvorin2012-11-091-7/+2
| | | | | | Instead of traversing and constructing a new set, share the set structure when constructing the pres_a set.
* ImprovementPablo Polvorin2012-11-091-1/+4
| | | | | Force the binary to be a heap binary, rather than keeping it as a refcount or sub-binary
* Fix and document persistent_history MUC option (EJABS-1865)Badlop2012-11-021-2/+2
|
* Merge branch '3.0.x' of ↵Alexey Shchepin2012-10-301-2/+4
|\ | | | | | | git+ssh://git@gitorious.process-one.net/+ejabberd-developers/ejabberd/maincustomers.git into 3.0.x
| * Show binaries as strings in WebAdmin; handle tab characters.Badlop2012-10-301-2/+4
| |
* | Fixed "message" tag checking in standby modeAlexey Shchepin2012-10-301-1/+1
|/
* Don't try to send privacy pushes in OOR mode (a line was not removed in the ↵Alexey Shchepin2012-10-301-1/+0
| | | | previous commit)
* Don't try to send privacy pushes in OOR modeAlexey Shchepin2012-10-301-15/+21
|
* Fix mod_ack:user_send_packet/3 signature (thanks zzolkiewski)Pablo Polvorin2012-10-291-4/+4
| | | | That hook has 4 arguments
* Show binaries in a pretty format in WebAdminBadlop2012-10-291-2/+36
|
* Get rid of dreaded tuple_to_list(now())Evgeniy Khramtsov2012-10-264-10/+5
|
* Fix data convertionEvgeniy Khramtsov2012-10-251-3/+8
|
* "epam" should return binaries, not stringsEvgeniy Khramtsov2012-10-241-1/+4
|
* Process 'max_s2s_connections' and 'max_s2s_connections_per_node'Evgeniy Khramtsov2012-10-231-17/+32
| | | | options correctly
* Merge branch '3.0.x' of ↵Alexey Shchepin2012-10-032-427/+664
|\ | | | | | | git+ssh://git@gitorious.process-one.net/+ejabberd-developers/ejabberd/maincustomers.git into 3.0.x
| * clean the pubsub odbc patchChristophe Romain2012-10-012-427/+664
| |
* | Fixed a typo in ejabberd_s2s_in SUPERVISOR_START definitionAlexey Shchepin2012-10-031-1/+1
|/
* Check a node of a migrating process (EJABS-1908)Evgeniy Khramtsov2012-09-273-6/+12
|
* Fix record definition (EJAB-1578)Badlop2012-09-181-1/+2
|
* Fix specEvgeniy Khramtsov2012-09-181-1/+1
|
* Fix dialyzer typesEvgeniy Khramtsov2012-09-181-1/+1
|
* Don't forget about webscoket_handlers in pipelined http requestsPaweł Chmielowski2012-09-141-8/+12
|
* Make websocket work over tlsPaweł Chmielowski2012-09-145-99/+134
|
* Unify paths for handling websocket and regular http requestsPaweł Chmielowski2012-09-145-106/+170
| | | | | | | This allow to easily produce html output from error paths in websocket code, and this ability is used to produce informational page when regular http request is directed to websocket url. Additionally HEAD and OPTIONS request are now handled correctly.
* Unify GET and POST handling codePaweł Chmielowski2012-09-141-90/+87
| | | | | Code for both it almost identical, extract all differences to separate function extract_path_query.
* Fix syntax error in ejabberd_websocketPaweł Chmielowski2012-09-141-1/+1
|
* Don't try to decode utf-8 codepoints in ej_websocket only to convert it back ↵Paweł Chmielowski2012-09-142-4/+3
| | | | | | | | | to utf-8 in ej_http_ws Additionally that conversion code was wrong sometimes and lead to loosing some bits of information. This fixes EJABS-1875
* Properly handle websocket sub-protocolsPaweł Chmielowski2012-09-141-5/+40
|
* Properly handle close op in websocketPaweł Chmielowski2012-09-141-5/+24
|
* Fix mod_ack, make it work with both oor and normal clients.Pablo Polvorin2012-09-133-8/+57
| | | | | | | | | | | | | If the client is able to go to oor, mod_ack must made it do so. If the client is not able to to go oor mode, mod_ack must stop the c2s session, and wait for it to really terminate before continuing (to avoid race conditions, see EJABS-1677). Conflicts: src/ejabberd_c2s.erl src/mod_ack.erl src/mod_ping.erl
* Make mod_ack work with applepush (TECH-1463) (thanks aleksey)Pablo Polvorin2012-09-131-7/+3
| | | | | | | | | | | | Do not forcelly kill the c2s process. Conflicts: src/mod_ack.erl Conflicts: src/mod_ack.erl
* LDAP StartTLS supportEvgeniy Khramtsov2012-09-133-100/+193
| | | | | | | | | | Conflicts: src/ejabberd_auth_ldap.erl src/eldap/eldap.erl src/mod_shared_roster_ldap.erl src/mod_vcard_ldap.erl src/tls/tls.erl
* Move SM dispatchers code in a separate fileEvgeniy Khramtsov2012-09-134-50/+226
| | | | | | | | | and make it more robust (EJABS-1845) Conflicts: src/ejabberd_sm.erl src/ejabberd_sup.erl
* Add forgotten fileEvgeniy Khramtsov2012-09-131-0/+35
|
* Make gen_iq_handlers more robust (EJABS-1758)Evgeniy Khramtsov2012-09-134-127/+197
| | | | | | | | Conflicts: src/ejabberd_local.erl src/ejabberd_sm.erl src/gen_iq_handler.erl
* Do not close session with an item-not-found error whenEvgeniy Khramtsov2012-09-131-14/+12
| | | | | | | | | receiving duplicate request with same rid as the currently active one (EJABS-1844) (thanks to Pawel Chmielowski) Conflicts: src/web/ejabberd_bosh.erl
* Allow multiple fqdn values in configuration (EJAB-1578)Badlop2012-09-121-8/+19
|
* Fix recent commit "Reduce size..."Badlop2012-09-121-2/+2
|
* put cleaning code to pubsub_debugChristophe Romain2012-09-122-57/+27
|
* Reduce size of XML stream stateJanusz Dziemidowicz2012-09-111-24/+27
| | | | | This makes size of hibernated ejabberd_receiver a lot smaller (from ~290 words down to ~40).
* Send announce Message stanzas as Headline type instead of NormalBadlop2012-09-111-3/+3
|
* Check node name is available before starting ejabberd (EJAB-1572)Badlop2012-09-111-67/+71
|
* Update Slovak translation (thanks to Marek Bečka)Badlop2012-09-111-350/+320
|
* fix configure to display generic versionChristophe Romain2012-09-111-9/+9
|
* update copyright date to 2012Christophe Romain2012-09-1130-60/+60
|
* binary refactoringChristophe Romain2012-09-11256-60735/+81925
|
* Merge branch '2.1.x' into 2.2.xEvgeniy Khramtsov2012-05-0439-9080/+2957
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/mod_muc/mod_muc.erl src/mod_muc/mod_muc_room.erl src/mod_offline.erl src/mod_offline_odbc.erl src/mod_shared_roster.erl src/web/ejabberd_http_bind.erl
| * Repeated http-bind request should abort only requests with same ridPaweł Chmielowski2012-05-031-23/+14
| | | | | | | | | | | | | | Before this change, when request with repeat rid was received any waiting request was aborted (but only after next request was delivered). With this change, only request with identical rid are aborted and this is done immediately
| * Receiving missing http-bind request shouldn't close waiting out-ouf-order ↵Paweł Chmielowski2012-05-031-11/+25
| | | | | | | | request
| * Fix get_subscription_lists/4Evgeniy Khramtsov2012-04-291-1/+1
| |