[evolution-data-server/gnome-3-6] Bug 689124 - Increase Camel's TCP read/write timeout

[Matthew Barnes <mbarnes src gnome org>]

commit 3cd321c6db1db529cf1f61f88e0e9d137244a3b3
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Dec 22 14:12:02 2012 -0500

    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)

 camel/camel-tcp-stream-raw.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/camel/camel-tcp-stream-raw.c b/camel/camel-tcp-stream-raw.c
index 05f41f3..9fd242f 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 {