summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2012-12-22 14:12:02 -0500
committerMatthew Barnes <mbarnes@redhat.com>2012-12-22 14:22:20 -0500
commit3cd321c6db1db529cf1f61f88e0e9d137244a3b3 (patch)
tree8d7a678852231578cb01b32833d3a8ee36b6ca3a
parent4250cb962167ee0797ee86dbe03b4a835a819a46 (diff)
downloadevolution-data-server-3cd321c6db1db529cf1f61f88e0e9d137244a3b3.tar.gz
Bug 689124 - Increase Camel's TCP read/write timeout
This is a partial revert of the hack for bug 551788, which decreased the TCP read/write timeout from 4 minutes to 1 minute. This causes IMAP IDLE connections to timeout prematurely if the server sends untagged keep-alive messages at an interval greater than 1 minute. Dovecot's "imap_idle_notify_interval" setting defaults to 2 minutes. Reset the TCP read/write timeout back to 4 minutes. (cherry picked from commit 4fee41524a90b2d4bf24705261e6f47b211fb86c)
-rw-r--r--camel/camel-tcp-stream-raw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/camel/camel-tcp-stream-raw.c b/camel/camel-tcp-stream-raw.c
index 05f41f34f..9fd242f2a 100644
--- a/camel/camel-tcp-stream-raw.c
+++ b/camel/camel-tcp-stream-raw.c
@@ -53,7 +53,7 @@
#define d(x)
-#define IO_TIMEOUT (PR_TicksPerSecond() * 1 * 60)
+#define IO_TIMEOUT (PR_TicksPerSecond() * 4 * 60)
#define CONNECT_TIMEOUT (PR_TicksPerSecond () * 1 * 60)
typedef struct _CamelTcpStreamRawPrivate {