aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--src/ejabberd_s2s_out.erl2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cc562289f..abf7f439c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-16 Christophe Romain <christophe.romain@process-one.net>
+
+ * src/ejabberd_s2s_out.erl: Change FSMTIMEOUT to 30s
+
2008-05-12 Badlop <badlop@process-one.net>
* src/mod_muc/mod_muc_room.erl: Return Forbidden error message
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
index 4271e43a6..781591b64 100644
--- a/src/ejabberd_s2s_out.erl
+++ b/src/ejabberd_s2s_out.erl
@@ -92,7 +92,7 @@
%% Only change this value if you now what your are doing:
-define(FSMLIMITS,[]).
%% -define(FSMLIMITS, [{max_queue, 2000}]).
--define(FSMTIMEOUT, 5000).
+-define(FSMTIMEOUT, 30000).
%% Maximum delay to wait before retrying to connect after a failed attempt.
%% Specified in miliseconds. Default value is 5 minutes.