Suggested change from Antony

diff --git a/include/memcached.h b/include/memcached.h
index b8d0803bfe86441baff0abc06912b1c2ba1a30d9..502b07b51ab3aa3560b4c1999ea4284950b638bb 100644 (file)
--- a/include/memcached.h
+++ b/include/memcached.h
@@ -35,7 +35,7 @@ typedef struct memcached_server_st memcached_server_st;
 #define MEMCACHED_MAX_HOST_LENGTH 64
 #define MEMCACHED_WHEEL_SIZE 1024
 #define MEMCACHED_STRIDE 4
-#define MEMCACHED_DEFAULT_TIMEOUT 65556
+#define MEMCACHED_DEFAULT_TIMEOUT INT16_MAX
 
 typedef enum {
   MEMCACHED_SUCCESS,

diff --git a/lib/memcached_connect.c b/lib/memcached_connect.c
index e00a630165a2e373805af086f441e49b61d0845c..f5acadfa6c61892a5261a4ff6f4179bb078465b9 100644 (file)
--- a/lib/memcached_connect.c
+++ b/lib/memcached_connect.c
@@ -142,7 +142,7 @@ static memcached_return tcp_connect(memcached_st *ptr, unsigned int server_key)
       struct linger linger;
 
       linger.l_onoff= 1; 
-      linger.l_linger= 65536; 
+      linger.l_linger= MEMCACHED_DEFAULT_TIMEOUT; 
       error= setsockopt(ptr->hosts[server_key].fd, SOL_SOCKET, SO_LINGER, 
                         &linger, (socklen_t)sizeof(struct linger));
       WATCHPOINT_ASSERT(error == 0);