From: Brian Aker <brian@tangent.org>
Date: Tue, 11 Dec 2007 08:25:29 +0000 (-0800)
Subject: Raised default timeout.
X-Git-Tag: 0.13~37
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=80f385f689fd04194182c1b202e576ad065626a9;p=m6w6%2Flibmemcached

Raised default timeout.
Removed bad assert, and useless debug message.
---

diff --git a/include/memcached.h b/include/memcached.h
index afc19641..b8d0803b 100644
--- 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 2000
+#define MEMCACHED_DEFAULT_TIMEOUT 65556
 
 typedef enum {
   MEMCACHED_SUCCESS,
diff --git a/lib/memcached_io.c b/lib/memcached_io.c
index 85a27d96..2c1bb14c 100644
--- a/lib/memcached_io.c
+++ b/lib/memcached_io.c
@@ -37,7 +37,6 @@ static memcached_return io_wait(memcached_st *ptr, unsigned int server_key,
     return MEMCACHED_SUCCESS;
   else if (error == 0)
   {
-    WATCHPOINT_NUMBER(read_or_write);
     return MEMCACHED_TIMEOUT;
   }
 
diff --git a/lib/memcached_quit.c b/lib/memcached_quit.c
index 9c77e71e..44f435c4 100644
--- a/lib/memcached_quit.c
+++ b/lib/memcached_quit.c
@@ -27,8 +27,6 @@ void memcached_quit_server(memcached_st *ptr, unsigned int server_key, uint8_t i
 
       memcached_io_close(ptr, server_key);
     }
-    else
-      WATCHPOINT_ASSERT(0);
 
     ptr->hosts[server_key].fd= -1;
     ptr->hosts[server_key].stack_responses= 0;