aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2007-12-06 17:42:25 +0000
committerBadlop <badlop@process-one.net>2007-12-06 17:42:25 +0000
commit60ea99d1a3e4e4c6d99c19b83d69083e5bbf39c7 (patch)
tree84bca6527860361441307ea884cd5d24f6d376c3
parent* src/Makefile.in: Allow compilation with HiPE, disabled by (diff)
* src/ejabberd_c2s.erl: Increase the timeout of open socket
without authentication to 60 seconds because many Jabber clients are not yet capable of handling this correctly (EJAB-355) SVN Revision: 1040
-rw-r--r--ChangeLog4
-rw-r--r--src/ejabberd_c2s.erl2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9e0fadb91..118f60c57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2007-12-06 Badlop <badlop@process-one.net>
+ * src/ejabberd_c2s.erl: Increase the timeout of open socket
+ without authentication to 60 seconds because many Jabber clients
+ are not yet capable of handling this correctly (EJAB-355)
+
* src/Makefile.in: Allow compilation with HiPE, disabled by
default, undocumented and unrecommended because it is experimental
and doesn't seem to provide meaningful gains currently (thanks to
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 725351950..7954f0586 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -89,7 +89,7 @@
%% This is the timeout to apply between event when starting a new
%% session:
--define(C2S_OPEN_TIMEOUT, 5000).
+-define(C2S_OPEN_TIMEOUT, 60000).
-define(C2S_HIBERNATE_TIMEOUT, 90000).
-define(STREAM_HEADER,