940ca9311d
Fix some dialyzer warnings
2017-02-18 09:36:27 +03:00
d5d906184f
Merge branch 'new_stream'
...
Conflicts:
src/cyrsasl.erl
src/ejabberd_c2s.erl
src/ejabberd_cluster.erl
src/ejabberd_frontend_socket.erl
src/ejabberd_node_groups.erl
src/ejabberd_router.erl
src/mod_bosh.erl
src/mod_ip_blacklist.erl
src/mod_muc_mnesia.erl
src/mod_offline.erl
src/mod_proxy65_sm.erl
2017-01-20 19:35:46 +03:00
1e55e018e5
Adopt remaining code to support new hooks
2017-01-09 17:02:17 +03:00
5fdd1c39fe
Update copyright date automatically ( #1442 )
2017-01-02 21:42:06 +01:00
78a44e0176
Merge branch 'master' into xml-ng
...
Conflicts:
src/adhoc.erl
src/cyrsasl_oauth.erl
src/ejabberd_c2s.erl
src/ejabberd_config.erl
src/ejabberd_service.erl
src/gen_mod.erl
src/mod_admin_extra.erl
src/mod_announce.erl
src/mod_carboncopy.erl
src/mod_client_state.erl
src/mod_configure.erl
src/mod_echo.erl
src/mod_mam.erl
src/mod_muc.erl
src/mod_muc_room.erl
src/mod_offline.erl
src/mod_pubsub.erl
src/mod_stats.erl
src/node_flat_sql.erl
src/randoms.erl
2016-11-12 13:27:15 +03:00
621f0e2b7c
New stream management option: ack_timeout
...
Close the connection if a stream management client fails to respond to
an acknowledgement request within 60 seconds. This number of seconds
can be changed with the new "ack_timeout" option, and the mechanism can
be disabled by specifying 'infinity'.
As a side effect of this change, a new acknowledgement is no longer
requested before the response to the previous request is received.
2016-09-07 23:16:54 +02:00
d5659735b3
Fixed #1260 Stream Management feature for the websocket connections
2016-08-23 00:59:39 +06:00
5cd1cf5096
Get rid of "jlib.hrl" dependency in some modules
2016-07-30 18:37:57 +03:00
dfc29ea03c
Switch to Fast XML module
2016-02-03 19:03:17 +01:00
f448ff608a
Update copyright to 2016 ( #901 )
2016-01-13 12:29:14 +01:00
8ee5f9fb6f
Remove http supervisors
2015-12-11 14:13:24 +01:00
4a4065c9c6
Let BOSH/WebSocket support "max_resume_timeout"
...
Allow for specifying the "max_resume_timeout" option in an ejabberd_http
listener for ejabberd_http_bind and/or ejabberd_http_ws.
2015-09-17 00:33:08 +02:00
f56a9e400d
Pass stream management options defined in http listener to http-bind and websocket
2015-09-04 12:42:53 +02:00
3a5dd51b42
Use websocket pings also on old style connections
2015-08-05 16:09:23 +02:00
fb6267f38e
Add config validation at startup
2015-06-01 15:38:27 +03:00
8732817c3c
Fix problem with pushing bufferend #xmlel-s to receiver in websocket code
2015-04-09 13:35:37 +02:00
81b0643036
Fix problem with c2s buffering on old style websocket connections
...
Old style websocket do use binaries for transferring data to C2S, so when
we buffer that data we need to handle it different than list of #xml structs
used by new style connections.
This fixes github issue #515 .
2015-04-06 17:54:45 +02:00
de26af3fdb
Make sure that we send each time <close> before closing websocket connection
2015-03-25 17:10:08 +01:00
e855791f16
Update types to fix dialyzer warnings
2015-03-12 10:34:34 +01:00
5bd8724801
Update FSF address
2015-02-25 15:19:33 +01:00
b42b171613
Add support for websocket connections
2015-02-25 13:57:02 +01:00
Evgeniy Khramtsov