Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Improvement | Pablo Polvorin | 2012-11-09 | 1 | -7/+2 |
| | | | | | | Instead of traversing and constructing a new set, share the set structure when constructing the pres_a set. | ||||
* | Improvement | Pablo Polvorin | 2012-11-09 | 1 | -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) | Badlop | 2012-11-02 | 1 | -2/+2 |
| | |||||
* | Merge branch '3.0.x' of ↵ | Alexey Shchepin | 2012-10-30 | 1 | -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. | Badlop | 2012-10-30 | 1 | -2/+4 |
| | | |||||
* | | Fixed "message" tag checking in standby mode | Alexey Shchepin | 2012-10-30 | 1 | -1/+1 |
|/ | |||||
* | Don't try to send privacy pushes in OOR mode (a line was not removed in the ↵ | Alexey Shchepin | 2012-10-30 | 1 | -1/+0 |
| | | | | previous commit) | ||||
* | Don't try to send privacy pushes in OOR mode | Alexey Shchepin | 2012-10-30 | 1 | -15/+21 |
| | |||||
* | Fix mod_ack:user_send_packet/3 signature (thanks zzolkiewski) | Pablo Polvorin | 2012-10-29 | 1 | -4/+4 |
| | | | | That hook has 4 arguments | ||||
* | Show binaries in a pretty format in WebAdmin | Badlop | 2012-10-29 | 1 | -2/+36 |
| | |||||
* | Get rid of dreaded tuple_to_list(now()) | Evgeniy Khramtsov | 2012-10-26 | 4 | -10/+5 |
| | |||||
* | Fix data convertion | Evgeniy Khramtsov | 2012-10-25 | 1 | -3/+8 |
| | |||||
* | "epam" should return binaries, not strings | Evgeniy Khramtsov | 2012-10-24 | 1 | -1/+4 |
| | |||||
* | Process 'max_s2s_connections' and 'max_s2s_connections_per_node' | Evgeniy Khramtsov | 2012-10-23 | 1 | -17/+32 |
| | | | | options correctly | ||||
* | Merge branch '3.0.x' of ↵ | Alexey Shchepin | 2012-10-03 | 2 | -427/+664 |
|\ | | | | | | | git+ssh://git@gitorious.process-one.net/+ejabberd-developers/ejabberd/maincustomers.git into 3.0.x | ||||
| * | clean the pubsub odbc patch | Christophe Romain | 2012-10-01 | 2 | -427/+664 |
| | | |||||
* | | Fixed a typo in ejabberd_s2s_in SUPERVISOR_START definition | Alexey Shchepin | 2012-10-03 | 1 | -1/+1 |
|/ | |||||
* | Check a node of a migrating process (EJABS-1908) | Evgeniy Khramtsov | 2012-09-27 | 3 | -6/+12 |
| | |||||
* | Fix record definition (EJAB-1578) | Badlop | 2012-09-18 | 1 | -1/+2 |
| | |||||
* | Fix spec | Evgeniy Khramtsov | 2012-09-18 | 1 | -1/+1 |
| | |||||
* | Fix dialyzer types | Evgeniy Khramtsov | 2012-09-18 | 1 | -1/+1 |
| | |||||
* | Don't forget about webscoket_handlers in pipelined http requests | Paweł Chmielowski | 2012-09-14 | 1 | -8/+12 |
| | |||||
* | Make websocket work over tls | Paweł Chmielowski | 2012-09-14 | 5 | -99/+134 |
| | |||||
* | Unify paths for handling websocket and regular http requests | Paweł Chmielowski | 2012-09-14 | 5 | -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 code | Paweł Chmielowski | 2012-09-14 | 1 | -90/+87 |
| | | | | | Code for both it almost identical, extract all differences to separate function extract_path_query. | ||||
* | Fix syntax error in ejabberd_websocket | Paweł Chmielowski | 2012-09-14 | 1 | -1/+1 |
| | |||||
* | Don't try to decode utf-8 codepoints in ej_websocket only to convert it back ↵ | Paweł Chmielowski | 2012-09-14 | 2 | -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-protocols | Paweł Chmielowski | 2012-09-14 | 1 | -5/+40 |
| | |||||
* | Properly handle close op in websocket | Paweł Chmielowski | 2012-09-14 | 1 | -5/+24 |
| | |||||
* | Fix mod_ack, make it work with both oor and normal clients. | Pablo Polvorin | 2012-09-13 | 3 | -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 Polvorin | 2012-09-13 | 1 | -7/+3 |
| | | | | | | | | | | | | Do not forcelly kill the c2s process. Conflicts: src/mod_ack.erl Conflicts: src/mod_ack.erl | ||||
* | LDAP StartTLS support | Evgeniy Khramtsov | 2012-09-13 | 3 | -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 file | Evgeniy Khramtsov | 2012-09-13 | 4 | -50/+226 |
| | | | | | | | | | and make it more robust (EJABS-1845) Conflicts: src/ejabberd_sm.erl src/ejabberd_sup.erl | ||||
* | Add forgotten file | Evgeniy Khramtsov | 2012-09-13 | 1 | -0/+35 |
| | |||||
* | Make gen_iq_handlers more robust (EJABS-1758) | Evgeniy Khramtsov | 2012-09-13 | 4 | -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 when | Evgeniy Khramtsov | 2012-09-13 | 1 | -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) | Badlop | 2012-09-12 | 1 | -8/+19 |
| | |||||
* | Fix recent commit "Reduce size..." | Badlop | 2012-09-12 | 1 | -2/+2 |
| | |||||
* | put cleaning code to pubsub_debug | Christophe Romain | 2012-09-12 | 2 | -57/+27 |
| | |||||
* | Reduce size of XML stream state | Janusz Dziemidowicz | 2012-09-11 | 1 | -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 Normal | Badlop | 2012-09-11 | 1 | -3/+3 |
| | |||||
* | Check node name is available before starting ejabberd (EJAB-1572) | Badlop | 2012-09-11 | 1 | -67/+71 |
| | |||||
* | Update Slovak translation (thanks to Marek Bečka) | Badlop | 2012-09-11 | 1 | -350/+320 |
| | |||||
* | fix configure to display generic version | Christophe Romain | 2012-09-11 | 1 | -9/+9 |
| | |||||
* | update copyright date to 2012 | Christophe Romain | 2012-09-11 | 30 | -60/+60 |
| | |||||
* | binary refactoring | Christophe Romain | 2012-09-11 | 256 | -60735/+81925 |
| | |||||
* | Merge branch '2.1.x' into 2.2.x | Evgeniy Khramtsov | 2012-05-04 | 39 | -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 rid | Paweł Chmielowski | 2012-05-03 | 1 | -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ł Chmielowski | 2012-05-03 | 1 | -11/+25 |
| | | | | | | | | request | ||||
| * | Fix get_subscription_lists/4 | Evgeniy Khramtsov | 2012-04-29 | 1 | -1/+1 |
| | |