aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Fix proxying of ACK requests for 2xx responsesEvgeniy Khramtsov2014-05-232-17/+58
| |/ |/|
* | Merge branch 'weiss-check-packet-type' into 3Badlop2014-05-211-9/+16
|\ \
| * | Merge branch 'check-packet-type' of git://github.com/weiss/ejabberd into ↵Badlop2014-05-211-9/+16
|/| | | | | | | | | | | | | | | | | | | | weiss-check-packet-type Conflicts: src/ejabberd_c2s.erl
| * | XEP-0198: Check whether routed packets are stanzasHolger Weiss2014-05-121-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-usagebadlop2014-05-211-0/+2
|\ \ \ | | | | | | | | Don't use cached passwords if "extauth_cache: 0"
| * | | Don't use cached passwords if "extauth_cache: 0"Holger Weiss2014-05-201-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-c2sbadlop2014-05-211-74/+51
|\ \ \ | | | | | | | | Cleanup some pieces of ejabberd_c2s
| * | | Fix check_from/2 formattingRadosław Szymczyszyn2014-05-201-17/+21
| | | |
| * | | Sanitize copy-pasted get_statustag/1Radosław Szymczyszyn2014-05-201-5/+1
| | | |
| * | | Fix formattingRadosław Szymczyszyn2014-05-201-32/+23
| | | |
| * | | Build proceed/compressed elements in a sane wayRadosław Szymczyszyn2014-05-201-20/+6
| | | |
* | | | Merge pull request #215 from weiss/fix-url-markupbadlop2014-05-211-4/+8
|\ \ \ \ | | | | | | | | | | Fix URL markup in the guide
| * | | | Fix URL markup in the guideHolger Weiss2014-05-201-4/+8
| |/ / /
* | | | Merge pull request #208 from weiss/update-travis-configbadlop2014-05-211-1/+1
|\ \ \ \ | | | | | | | | | | Travis CI: Remove unnecessary configure flag
| * | | | Travis CI: Remove unnecessary configure flagHolger Weiss2014-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | The test suite no longer fails without --enable-transient_supervisors.
* | | | | Merge pull request #207 from weiss/xep-0334badlop2014-05-214-36/+65
|\ \ \ \ \ | |_|_|/ / |/| | | | Honor XEP-0334: Message Processing Hints
| * | | | Don't log MUC messages with <no-store/> hintHolger Weiss2014-05-121-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | Honor the <no-store/> and <no-permanent-store/> hints defined in XEP-0334.
| * | | | Don't store messages with <no-store/> hintHolger Weiss2014-05-122-11/+29
| | | | | | | | | | | | | | | | | | | | Honor the <no-store/> hint defined in XEP-0334.
| * | | | Don't carbon copy messages with <no-copy/> hintHolger Weiss2014-05-111-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)Badlop2014-05-201-2/+2
| |/ / |/| |
* | | MUC messages with ~ were not logged (EJAB-1696)Badlop2014-05-191-1/+3
| | |
* | | Merge pull request #213 from weiss/fix-xmlrcp-doc-urlbadlop2014-05-191-1/+1
|\ \ \ | | | | | | | | Update ejabberd_xmlrpc documentation URL in the guide
| * | | Update ejabberd_xmlrpc documentation URLHolger Weiss2014-05-141-1/+1
|/ / /
* | | Fix bug when joining empty pathBadlop2014-05-141-0/+1
| | |
* | | Merge pull request #212 from weiss/fix-presence-updatesEvgeny Khramtsov2014-05-141-1/+1
|\ \ \ | |_|/ |/| | Don't miss incoming presence updates
| * | Don't miss incoming presence updatesHolger Weiss2014-05-141-1/+1
|/ /
* | Merge pull request #209 from weiss/rename-disconnect-userbadlop2014-05-122-5/+5
|\ \ | |/ |/| Rename disconnect_user/2 command
| * Rename disconnect_user/2 commandHolger Weiss2014-05-122-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.05Evgeny Khramtsov2014-05-101-9/+16
|\ | | | | XEP-0198: Improve handling of incorrect stanza counts reported by client
| * XEP-0198: Improve handling of too large 'h' valuesHolger Weiss2014-05-091-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' valueHolger Weiss2014-05-091-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 elementsHolger Weiss2014-05-091-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 JIDsEvgeniy Khramtsov2014-05-091-11/+18
|/
* Fix previous commit (C2S session close on server shutdown)Evgeniy Khramtsov2014-05-081-1/+1
|
* Merge branch 'master' of github.com:processone/ejabberdEvgeniy Khramtsov2014-05-081-25/+110
|\
| * Recompile the GuideBadlop2014-05-081-25/+110
| |
* | Fix C2S session close on server shutdownEvgeniy Khramtsov2014-05-082-4/+17
|/
* TURN support (EJAB-1017)Evgeniy Khramtsov2014-05-084-31/+176
|
* Merge pull request #203 from hamano/added_get_random_pid_error_handlingEvgeny Khramtsov2014-05-083-2/+4
|\ | | | | improve error handling when sql calling with (empty|unknown) host.
| * improve error handling when sql calling with (empty|unknown) host.HAMANO Tsukasa2014-05-013-2/+4
| | | | | | | | see #191
* | Merge pull request #180 from hamano/mysql_tableEvgeny Khramtsov2014-05-071-0/+1
|\ \ | | | | | | added privacy_list_data index for mysql database.
| * | added privacy_list_data index for mysql database.HAMANO Tsukasa2014-04-241-0/+1
| | |
* | | Webadmin with extauth requires internal to run at least once (issue #201)Badlop2014-05-071-4/+2
| | |
* | | Merge pull request #200 from hamano/mod_offline_bugbadlop2014-05-071-1/+1
|\ \ \ | | | | | | | | fix mod_offline:count_offline_messages/2
| * | | fix mod_offline:count_offline_messages/2HAMANO Tsukasa2014-05-071-1/+1
|/ / /
* | | Revert "Document that ejabberd compilation requires pkg-config"Evgeniy Khramtsov2014-05-072-2/+0
| | | | | | | | | | | | This reverts commit bd0060715ec776c6417422ca4aebea853cfa82e1.
* | | Merge pull request #166 from weiss/xep-0198Evgeny Khramtsov2014-05-065-134/+789
|\ \ \ | | | | | | | | Add support for XEP-0198: Stream Management
| * \ \ Merge remote-tracking branch 'processone/master' into xep-0198Holger Weiss2014-05-06178-3951/+5551
| |\ \ \ | |/ / / |/| | | | | | | | | | | | | | | Conflicts: doc/guide.tex src/ejabberd_c2s.erl
* | | | Fix PEP broadcasting issue on ODBC (EJAB-1680)Christophe Romain2014-05-061-11/+10
| | | |
* | | | Fix PEP broadcasting issue (EJAB-1680)Christophe Romain2014-05-061-11/+10
| | | |