Raised default timeout.

Removed bad assert, and useless debug message.

diff --git a/include/memcached.h b/include/memcached.h
index afc19641fe5dacf25b61dbfdddf316e7435f0253..b8d0803bfe86441baff0abc06912b1c2ba1a30d9 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 2000
+#define MEMCACHED_DEFAULT_TIMEOUT 65556
 
 typedef enum {
   MEMCACHED_SUCCESS,

diff --git a/lib/memcached_io.c b/lib/memcached_io.c
index 85a27d962b3d4acc046e11c1bc9aca39b046db61..2c1bb14c3860df761f6011fe799bb9ebdf0d6793 100644 (file)
--- 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 9c77e71e0180dc552bff27f8922b231073a6d4a9..44f435c480b91fa5db4483dba0ab722620d16161 100644 (file)
--- 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;