48600ae71d
Update id.msg
2014-05-24 17:53:39 +07:00
8925975c86
Fix proxying of ACK requests for 2xx responses
2014-05-23 20:14:53 +04:00
6baf3a24de
Merge branch 'weiss-check-packet-type' into 3
2014-05-21 18:45:43 +02:00
735bd95659
Merge branch 'check-packet-type' of git://github.com/weiss/ejabberd into weiss-check-packet-type
...
Conflicts:
src/ejabberd_c2s.erl
2014-05-21 18:45:28 +02:00
69abb48c90
Merge pull request #217 from weiss/fix-extauth-cache-usage
...
Don't use cached passwords if "extauth_cache: 0"
2014-05-21 17:35:54 +02:00
419a98d45a
Merge pull request #216 from lavrin/p1-c2s
...
Cleanup some pieces of ejabberd_c2s
2014-05-21 17:35:24 +02:00
0dc8429d16
Merge pull request #215 from weiss/fix-url-markup
...
Fix URL markup in the guide
2014-05-21 17:33:56 +02:00
b9210d491a
Merge pull request #208 from weiss/update-travis-config
...
Travis CI: Remove unnecessary configure flag
2014-05-21 17:31:49 +02:00
5d855f3723
Merge pull request #207 from weiss/xep-0334
...
Honor XEP-0334: Message Processing Hints
2014-05-21 17:31:22 +02:00
fca640f50f
Don't use cached passwords if "extauth_cache: 0"
...
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.
2014-05-20 23:00:28 +02:00
5010cea1a4
If log uses file:write, no need to double escape ~ in messages (EJAB-1696)
2014-05-20 14:49:52 +02:00
5726636053
Fix check_from/2 formatting
2014-05-20 12:31:28 +01:00
b7a542e074
Sanitize copy-pasted get_statustag/1
2014-05-20 12:28:14 +01:00
9c37450fe4
Fix formatting
2014-05-20 12:26:33 +01:00
c39ce133de
Build proceed/compressed elements in a sane way
2014-05-20 11:52:02 +01:00
dd543af2f6
Fix URL markup in the guide
2014-05-20 00:24:34 +02:00
6d06f22f64
MUC messages with ~ were not logged (EJAB-1696)
2014-05-19 19:07:46 +02:00
862166511c
Merge pull request #213 from weiss/fix-xmlrcp-doc-url
...
Update ejabberd_xmlrpc documentation URL in the guide
2014-05-19 11:46:37 +02:00
4e54c53abb
Update ejabberd_xmlrpc documentation URL
2014-05-14 22:39:19 +02:00
a6ddab1e9d
Fix bug when joining empty path
2014-05-14 13:28:39 +02:00
3c045ba8aa
Merge pull request #212 from weiss/fix-presence-updates
...
Don't miss incoming presence updates
2014-05-14 08:06:40 +04:00
6e8dd5bdff
Don't miss incoming presence updates
2014-05-14 01:04:38 +02:00
f6da708b02
XEP-0198: Check whether routed packets are stanzas
...
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.
2014-05-12 19:20:25 +02:00
23fdf0e889
Merge pull request #209 from weiss/rename-disconnect-user
...
Rename disconnect_user/2 command
2014-05-12 12:55:15 +02:00
9121ca14de
Rename disconnect_user/2 command
...
The mod_admin_extra module provides a kick_session/4 command. Rename
the disconnect_user/2 command to kick_user/2 for consistency.
2014-05-12 12:44:40 +02:00
f4a3dbea70
Travis CI: Remove unnecessary configure flag
...
The test suite no longer fails without --enable-transient_supervisors.
2014-05-12 10:28:02 +02:00
47efe4e6a9
Don't log MUC messages with <no-store/> hint
...
Honor the <no-store/> and <no-permanent-store/> hints defined in
XEP-0334.
2014-05-12 00:27:20 +02:00
03fd88e4ec
Don't store messages with <no-store/> hint
...
Honor the <no-store/> hint defined in XEP-0334.
2014-05-12 00:00:34 +02:00
9b16d09261
Don't carbon copy messages with <no-copy/> hint
...
Honor the <no-copy/> hint defined in XEP-0334.
2014-05-11 23:52:20 +02:00
5d22159e9a
Merge pull request #205 from weiss/xep-0198
...
XEP-0198: Improve handling of incorrect stanza counts reported by client
2014-05-10 00:05:17 +04:00
003fd321ee
Do not try to retreive vCards via local SM for foreign JIDs
2014-05-09 21:26:55 +04:00
6d5bfcfe9b
XEP-0198: Improve handling of too large 'h' values
...
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.
2014-05-09 18:28:14 +02:00
15369ff9d7
XEP-0198: Reject <resume/> with negative 'h' value
...
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.
2014-05-09 18:01:31 +02:00
a60fda7df4
XEP-0198: Don't warn on invalid ACK elements
...
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.
2014-05-09 17:54:12 +02:00
318b0f2208
Fix previous commit (C2S session close on server shutdown)
2014-05-08 21:47:50 +04:00
b995178e30
Merge branch 'master' of github.com:processone/ejabberd
2014-05-08 21:40:14 +04:00
181e7a823e
Fix C2S session close on server shutdown
2014-05-08 21:39:53 +04:00
0716a8cdae
Recompile the Guide
2014-05-08 17:58:25 +02:00
90a5c054d4
TURN support (EJAB-1017)
2014-05-08 16:14:21 +04:00
115da54557
Merge pull request #203 from hamano/added_get_random_pid_error_handling
...
improve error handling when sql calling with (empty|unknown) host.
2014-05-08 10:02:27 +04:00
e88a5c6b3c
Merge pull request #180 from hamano/mysql_table
...
added privacy_list_data index for mysql database.
2014-05-07 20:57:59 +04:00
79a49b1175
Webadmin with extauth requires internal to run at least once (issue #201 )
2014-05-07 17:13:51 +02:00
c511194c2e
Merge pull request #200 from hamano/mod_offline_bug
...
fix mod_offline:count_offline_messages/2
2014-05-07 16:49:31 +02:00
d3ed12d4ba
fix mod_offline:count_offline_messages/2
2014-05-07 15:38:18 +09:00
e7c94975eb
Revert "Document that ejabberd compilation requires pkg-config"
...
This reverts commit bd0060715e
2014-05-07 01:05:07 +04:00
47f627e605
Merge pull request #166 from weiss/xep-0198
...
Add support for XEP-0198: Stream Management
2014-05-06 23:50:49 +04:00
d343447cc9
Merge remote-tracking branch 'processone/master' into xep-0198
...
Conflicts:
doc/guide.tex
src/ejabberd_c2s.erl
2014-05-06 21:41:29 +02:00
cc1f93d7a0
Fix PEP broadcasting issue on ODBC (EJAB-1680)
2014-05-06 13:29:35 +02:00
58717923eb
Fix PEP broadcasting issue (EJAB-1680)
2014-05-06 12:37:44 +02:00
1aa56af541
Merge pull request #198 from weiss/add-travis-support
...
Add Travis CI configuration file
2014-05-06 13:13:56 +04:00
bLaDe