Evgeny Khramtsov
c7d9b46b6f
Merge pull request #324 from liudanking/master
...
fix odbc_keepalive_interval configuration bug
2014-10-21 11:03:16 +04:00
liudan
d2edcf1288
fix odbc keepalive interval bug
2014-10-21 10:05:44 +08:00
Evgeniy Khramtsov
160c9d7698
Remove append_host_config from ejabberd.yml.example
2014-10-20 12:59:30 +04:00
Evgeny Khramtsov
ecd35f7ba8
Merge pull request #322 from weiss/xep-0198
...
XEP-0198: Abort immediately on stanza queue overflow
2014-10-17 11:56:25 +04:00
Holger Weiss
0c24e18b5e
XEP-0198: Abort immediately on queue overflow
...
Terminate the ejabberd_c2s process immediately once stanza queue
overflow is detected. This makes sure the FSM won't process additional
stanzas before terminating if the recipient is flooded.
2014-10-17 01:35:30 +02:00
Evgeny Khramtsov
adaa067333
Merge pull request #317 from weiss/xep-0198
...
XEP-0198: Set #state.conn field on session resume
2014-10-13 20:38:15 +04:00
Evgeny Khramtsov
724a31fa13
Merge pull request #318 from weiss/remove-xmlrpc-dep
...
Remove "xmlrpc" dependency for "make rel"
2014-10-13 20:37:28 +04:00
Holger Weiss
1ccc0d8bcb
XEP-0198: Set #state.conn field on session resume
2014-10-12 19:44:35 +02:00
Holger Weiss
3f3f64c217
Remove "xmlrpc" dependency for "make rel"
...
The "xmlrpc" library isn't used anymore.
2014-10-12 17:23:25 +02:00
Evgeny Khramtsov
97fa57c360
Merge pull request #316 from weiss/really-require-tls
...
Make sure "starttls_required" can't be bypassed
2014-10-12 11:05:49 +04:00
Holger Weiss
7bdc1151b1
Make sure "starttls_required" can't be bypassed
...
Don't allow clients to circumvent the "starttls_required" option by
enabling XMPP stream compression.
2014-10-12 02:08:08 +02:00
Evgeniy Khramtsov
4bbf16b21a
Fix list unblocking when Riak is used as a backend
2014-10-10 11:38:13 +04:00
Evgeniy Khramtsov
d87ca9fb7b
Fix format of an XML-RPC response
2014-10-04 12:55:59 +04:00
Evgeniy Khramtsov
7b3209cc7f
Switch to P1 implementation of XML-RPC
2014-10-04 12:49:33 +04:00
Evgeniy Khramtsov
1d782db84f
Process XML-RPC requests via p1_xml and ejabberd_http
2014-10-04 12:49:12 +04:00
Evgeniy Khramtsov
e109f352e3
Make directory creation more robust
2014-10-02 14:21:27 +04:00
Evgeny Khramtsov
6e63ee480e
Merge pull request #310 from weiss/ignore-rel-dir
...
Let Git ignore the "rel/ejabberd" directory
2014-09-30 13:50:32 +04:00
Holger Weiss
90fb19797d
Let Git ignore the "rel/ejabberd" directory
2014-09-30 11:35:58 +02:00
Evgeny Khramtsov
415936146b
Merge pull request #303 from weiss/no-csi-if-unconfigured
...
Offer CSI stream feature only if mod_client_state is enabled
2014-09-26 13:16:28 +04:00
Holger Weiss
277e1dc3ff
Offer CSI stream feature only if configured
...
Don't offer the CSI stream feature when mod_client_state isn't actually
configured to filter stanzas. This makes sure clients won't send CSI
tags that end up being ignored.
2014-09-25 18:28:20 +02:00
Holger Weiss
56175fef1b
Add new hook: c2s_post_auth_features
...
The c2s_post_auth_features hook can be used to extend the list of stream
features offered after authentication.
2014-09-25 18:15:33 +02:00
Evgeny Khramtsov
ef89497d3f
Merge pull request #307 from weiss/remove-invisible-presence
...
Remove invisible presence fields from c2s #state
2014-09-25 17:20:45 +04:00
Holger Weiss
7aec0337e1
Remove invisible presence fields from c2s #state
...
Invisible presence isn't supported anymore, so the corresponding
ejabberd_c2s #state fields were unused.
2014-09-25 00:08:56 +02:00
Evgeny Khramtsov
e49cf604e9
Merge pull request #302 from weiss/ldap-deref-aliases
...
Rename deref_aliases back to ldap_deref_aliases
2014-09-23 13:54:22 +04:00
Holger Weiss
61c8836740
Rename deref_aliases back to ldap_deref_aliases
...
The "ldap_deref_aliases" option has accidentally been renamed to
"deref_aliases". Revert that change (but accept both names for a
while), so that the option name now matches the documentation again.
2014-09-23 11:31:44 +02:00
Evgeny Khramtsov
57dec40007
Merge pull request #301 from Iperity/master
...
Fix init script
2014-09-18 01:17:04 +04:00
Nathan Bruning
29a841d8c7
Fix init script: use getent to allow ejabberd user from external authentication sources (LDAP)
2014-09-17 21:28:50 +02:00
Evgeny Khramtsov
c18413c52b
Merge pull request #300 from weiss/resend-if-offline
...
XEP-0198: Support "resend_on_timeout: if_offline"
2014-09-17 09:31:09 +04:00
Holger Weiss
0a9212583d
XEP-0198: Support "resend_on_timeout: if_offline"
...
If "resend_on_timeout" is set to "if_offline", resend unacknowledged
stanzas only if no other resource is online when the session times out.
In other words, allow for sending them to offline storage, but nowhere
else.
2014-09-16 22:42:34 +02:00
Evgeny Khramtsov
19446967fa
Merge pull request #299 from sjmackenzie/processone
...
added p1_utils to reltool.config resolving treap:empty() undefined error
2014-09-15 09:31:27 +04:00
stewart
8d9a9228d9
added p1_utils to reltool.config resolving treap:empty() undefined error
2014-09-15 04:06:07 +00:00
Evgeniy Khramtsov
72fd353988
Avoid generation of excessive records
2014-09-13 22:54:07 +04:00
Evgeny Khramtsov
c90786527e
Merge pull request #298 from weiss/csi
...
Add support for XEP-0352: Client State Indication (CSI)
2014-09-12 21:55:10 +04:00
Holger Weiss
1a320baad8
Add tests for Client State Indication support
2014-09-11 18:18:20 +02:00
Holger Weiss
b8c98232b8
Support XEP-0352: Client State Indication
2014-09-11 17:44:29 +02:00
Evgeny Khramtsov
f723c00762
Merge pull request #297 from weiss/remove-configure-flag
...
Travis CI: Remove unused configure flag
2014-09-11 19:35:50 +04:00
Holger Weiss
4d59f677a9
Travis CI: Remove unused configure flag
...
The --disable-http flag no longer exists.
2014-09-10 21:04:43 +02:00
Evgeny Khramtsov
7a48e30523
Merge pull request #296 from weiss/remove-unused-clause
...
XEP-0198: Remove unused function clause
2014-09-07 07:27:17 +04:00
Evgeny Khramtsov
f0887e45b8
Merge pull request #295 from weiss/xep-0198
...
XEP-0198: Change state immediately when gen_tcp:send/2 returns failure
2014-09-07 07:27:07 +04:00
Holger Weiss
2ca563e328
XEP-0198: Remove unused function clause
...
In the 'wait_for_resume' state, #state.mgmt_pending_since is always
initialized. fsm_next_state/2 takes care of that.
2014-09-06 20:39:38 +02:00
Holger Weiss
2e169167d4
XEP-0198: Change state on gen_tcp:send/2 failure
...
When Stream Management is enabled and a gen_tcp:send/2 call fails, go
into the 'wait_for_resume' state immediately. This makes sure that
gen_tcp:send/2 won't be called again, which might avoid an Erlang issue
where gen_tcp:send/2 apparently hangs despite 'send_timeout' (and
'send_timeout_close') being set.
2014-09-06 20:34:32 +02:00
Holger Weiss
11b2921971
XEP-0198: Let fsm_next_state/2 check timeout value
...
Don't force the fsm_next_state/2 caller to check for 'mgmt_timeout = 0'.
2014-09-06 20:29:02 +02:00
Christophe Romain
646b445515
allow guide not to be compiled for install
2014-09-05 19:16:13 +04:00
Evgeniy Khramtsov
50d7046517
Test MUC nick registration
2014-09-03 21:30:44 +04:00
Evgeniy Khramtsov
c3eaa29f70
Parse x:data in jabber:register
2014-09-03 21:30:27 +04:00
Evgeniy Khramtsov
ac2ba399a9
Make sure x:data form possesses 'type' attribute
2014-09-03 21:28:55 +04:00
Evgeniy Khramtsov
fda73c3d16
Fix privacy checks of presence probes
2014-09-01 16:39:02 +04:00
Evgeniy Khramtsov
a1ce33ebf8
Automatically remove IPs from ban, add the documentation
2014-08-27 13:25:49 +04:00
Evgeniy Khramtsov
9be9949dab
Remove useless -include()
2014-08-27 13:18:29 +04:00
Evgeniy Khramtsov
0f1d95a074
Ban the IP if there are too many failed authentications
2014-08-27 13:18:22 +04:00
