Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Fix proxying of ACK requests for 2xx responses | Evgeniy Khramtsov | 2014-05-23 | 2 | -17/+58 | |
| |/ |/| | ||||||
* | | Merge branch 'weiss-check-packet-type' into 3 | Badlop | 2014-05-21 | 1 | -9/+16 | |
|\ \ | ||||||
| * | | Merge branch 'check-packet-type' of git://github.com/weiss/ejabberd into ↵ | Badlop | 2014-05-21 | 1 | -9/+16 | |
|/| | | | | | | | | | | | | | | | | | | | | weiss-check-packet-type Conflicts: src/ejabberd_c2s.erl | |||||
| * | | XEP-0198: Check whether routed packets are stanzas | Holger Weiss | 2014-05-12 | 1 | -9/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Only stanzas are subject to stream management, so when XEP-0198 support is enabled, we must distinguish them from non-stanza elements. This commit adds a send_packet/2 function that can be used in place of send_stanza/2 or send_element/2 whenever a packet is delivered that might or might not be a stanza. | |||||
* | | | Merge pull request #217 from weiss/fix-extauth-cache-usage | badlop | 2014-05-21 | 1 | -0/+2 | |
|\ \ \ | | | | | | | | | Don't use cached passwords if "extauth_cache: 0" | |||||
| * | | | Don't use cached passwords if "extauth_cache: 0" | Holger Weiss | 2014-05-20 | 1 | -0/+2 | |
| | |/ | |/| | | | | | | | | | | | | | | | | Regarding "extauth_cache", the guide says: "The integer 0 (zero) enables caching for statistics, but doesn't use that cached information to authenticate users." Make sure the cached password isn't used even if the user is currently logged in with another resource. | |||||
* | | | Merge pull request #216 from lavrin/p1-c2s | badlop | 2014-05-21 | 1 | -74/+51 | |
|\ \ \ | | | | | | | | | Cleanup some pieces of ejabberd_c2s | |||||
| * | | | Fix check_from/2 formatting | Radosław Szymczyszyn | 2014-05-20 | 1 | -17/+21 | |
| | | | | ||||||
| * | | | Sanitize copy-pasted get_statustag/1 | Radosław Szymczyszyn | 2014-05-20 | 1 | -5/+1 | |
| | | | | ||||||
| * | | | Fix formatting | Radosław Szymczyszyn | 2014-05-20 | 1 | -32/+23 | |
| | | | | ||||||
| * | | | Build proceed/compressed elements in a sane way | Radosław Szymczyszyn | 2014-05-20 | 1 | -20/+6 | |
| | | | | ||||||
* | | | | Merge pull request #215 from weiss/fix-url-markup | badlop | 2014-05-21 | 1 | -4/+8 | |
|\ \ \ \ | | | | | | | | | | | Fix URL markup in the guide | |||||
| * | | | | Fix URL markup in the guide | Holger Weiss | 2014-05-20 | 1 | -4/+8 | |
| |/ / / | ||||||
* | | | | Merge pull request #208 from weiss/update-travis-config | badlop | 2014-05-21 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Travis CI: Remove unnecessary configure flag | |||||
| * | | | | Travis CI: Remove unnecessary configure flag | Holger Weiss | 2014-05-12 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | The test suite no longer fails without --enable-transient_supervisors. | |||||
* | | | | | Merge pull request #207 from weiss/xep-0334 | badlop | 2014-05-21 | 4 | -36/+65 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Honor XEP-0334: Message Processing Hints | |||||
| * | | | | Don't log MUC messages with <no-store/> hint | Holger Weiss | 2014-05-12 | 1 | -9/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Honor the <no-store/> and <no-permanent-store/> hints defined in XEP-0334. | |||||
| * | | | | Don't store messages with <no-store/> hint | Holger Weiss | 2014-05-12 | 2 | -11/+29 | |
| | | | | | | | | | | | | | | | | | | | | Honor the <no-store/> hint defined in XEP-0334. | |||||
| * | | | | Don't carbon copy messages with <no-copy/> hint | Holger Weiss | 2014-05-11 | 1 | -16/+21 | |
| |/ / / | | | | | | | | | | | | | Honor the <no-copy/> hint defined in XEP-0334. | |||||
* | / / | If log uses file:write, no need to double escape ~ in messages (EJAB-1696) | Badlop | 2014-05-20 | 1 | -2/+2 | |
| |/ / |/| | | ||||||
* | | | MUC messages with ~ were not logged (EJAB-1696) | Badlop | 2014-05-19 | 1 | -1/+3 | |
| | | | ||||||
* | | | Merge pull request #213 from weiss/fix-xmlrcp-doc-url | badlop | 2014-05-19 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Update ejabberd_xmlrpc documentation URL in the guide | |||||
| * | | | Update ejabberd_xmlrpc documentation URL | Holger Weiss | 2014-05-14 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Fix bug when joining empty path | Badlop | 2014-05-14 | 1 | -0/+1 | |
| | | | ||||||
* | | | Merge pull request #212 from weiss/fix-presence-updates | Evgeny Khramtsov | 2014-05-14 | 1 | -1/+1 | |
|\ \ \ | |_|/ |/| | | Don't miss incoming presence updates | |||||
| * | | Don't miss incoming presence updates | Holger Weiss | 2014-05-14 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #209 from weiss/rename-disconnect-user | badlop | 2014-05-12 | 2 | -5/+5 | |
|\ \ | |/ |/| | Rename disconnect_user/2 command | |||||
| * | Rename disconnect_user/2 command | Holger Weiss | 2014-05-12 | 2 | -5/+5 | |
|/ | | | | | The mod_admin_extra module provides a kick_session/4 command. Rename the disconnect_user/2 command to kick_user/2 for consistency. | |||||
* | Merge pull request #205 from weiss/xep-019814.05 | Evgeny Khramtsov | 2014-05-10 | 1 | -9/+16 | |
|\ | | | | | XEP-0198: Improve handling of incorrect stanza counts reported by client | |||||
| * | XEP-0198: Improve handling of too large 'h' values | Holger Weiss | 2014-05-09 | 1 | -7/+14 | |
| | | | | | | | | | | | | | | | | If the client says that it handled more stanzas than we sent (due to a bug in the client's or in our code), increase our outgoing stanza count accordingly. There's no point in sticking to the old value even if it was correct, as the client surely won't fix its count during the current session. | |||||
| * | XEP-0198: Reject <resume/> with negative 'h' value | Holger Weiss | 2014-05-09 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | Make sure the 'h' attribute sent with a <resume/> request is nonnegative, as mandated by XEP-0198. We already have this check for <a/> elements. | |||||
| * | XEP-0198: Don't warn on invalid ACK elements | Holger Weiss | 2014-05-09 | 1 | -2/+2 | |
| | | | | | | | | | | | | Do not log a warning (but only a debug message) if the client sends an invalid </a> packet. Some clients do that occasionally, and there's nothing server admininistrators could do about that. | |||||
* | | Do not try to retreive vCards via local SM for foreign JIDs | Evgeniy Khramtsov | 2014-05-09 | 1 | -11/+18 | |
|/ | ||||||
* | Fix previous commit (C2S session close on server shutdown) | Evgeniy Khramtsov | 2014-05-08 | 1 | -1/+1 | |
| | ||||||
* | Merge branch 'master' of github.com:processone/ejabberd | Evgeniy Khramtsov | 2014-05-08 | 1 | -25/+110 | |
|\ | ||||||
| * | Recompile the Guide | Badlop | 2014-05-08 | 1 | -25/+110 | |
| | | ||||||
* | | Fix C2S session close on server shutdown | Evgeniy Khramtsov | 2014-05-08 | 2 | -4/+17 | |
|/ | ||||||
* | TURN support (EJAB-1017) | Evgeniy Khramtsov | 2014-05-08 | 4 | -31/+176 | |
| | ||||||
* | Merge pull request #203 from hamano/added_get_random_pid_error_handling | Evgeny Khramtsov | 2014-05-08 | 3 | -2/+4 | |
|\ | | | | | improve error handling when sql calling with (empty|unknown) host. | |||||
| * | improve error handling when sql calling with (empty|unknown) host. | HAMANO Tsukasa | 2014-05-01 | 3 | -2/+4 | |
| | | | | | | | | see #191 | |||||
* | | Merge pull request #180 from hamano/mysql_table | Evgeny Khramtsov | 2014-05-07 | 1 | -0/+1 | |
|\ \ | | | | | | | added privacy_list_data index for mysql database. | |||||
| * | | added privacy_list_data index for mysql database. | HAMANO Tsukasa | 2014-04-24 | 1 | -0/+1 | |
| | | | ||||||
* | | | Webadmin with extauth requires internal to run at least once (issue #201) | Badlop | 2014-05-07 | 1 | -4/+2 | |
| | | | ||||||
* | | | Merge pull request #200 from hamano/mod_offline_bug | badlop | 2014-05-07 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | fix mod_offline:count_offline_messages/2 | |||||
| * | | | fix mod_offline:count_offline_messages/2 | HAMANO Tsukasa | 2014-05-07 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Revert "Document that ejabberd compilation requires pkg-config" | Evgeniy Khramtsov | 2014-05-07 | 2 | -2/+0 | |
| | | | | | | | | | | | | This reverts commit bd0060715ec776c6417422ca4aebea853cfa82e1. | |||||
* | | | Merge pull request #166 from weiss/xep-0198 | Evgeny Khramtsov | 2014-05-06 | 5 | -134/+789 | |
|\ \ \ | | | | | | | | | Add support for XEP-0198: Stream Management | |||||
| * \ \ | Merge remote-tracking branch 'processone/master' into xep-0198 | Holger Weiss | 2014-05-06 | 178 | -3951/+5551 | |
| |\ \ \ | |/ / / |/| | | | | | | | | | | | | | | | Conflicts: doc/guide.tex src/ejabberd_c2s.erl | |||||
* | | | | Fix PEP broadcasting issue on ODBC (EJAB-1680) | Christophe Romain | 2014-05-06 | 1 | -11/+10 | |
| | | | | ||||||
* | | | | Fix PEP broadcasting issue (EJAB-1680) | Christophe Romain | 2014-05-06 | 1 | -11/+10 | |
| | | | |