Portability patches from Kevin Dalley for Freebsd 4.0.

[m6w6/libmemcached] / lib / memcached_quit.c

diff --git a/lib/memcached_quit.c b/lib/memcached_quit.c
index 483b177249ae2e956f4a0f56872e0f146f3ae5e2..fdc86b6c7abce98d86c9b4dab90a4d49693cece4 100644 (file)
--- a/lib/memcached_quit.c
+++ b/lib/memcached_quit.c
@@ -9,27 +9,31 @@
   will force data to be completed.
 */
 
-void memcached_quit_server(memcached_st *ptr, unsigned int server_key)
+void memcached_quit_server(memcached_st *ptr, unsigned int server_key, uint8_t io_death)
 {
-  if (ptr->hosts == NULL || 
-      ptr->number_of_hosts == 0 ||
-      server_key > ptr->number_of_hosts)
+  if (server_key > ptr->number_of_hosts)
+  {
+    WATCHPOINT_ASSERT(0);
     return;
+  }
 
   if (ptr->hosts[server_key].fd != -1)
   {
-    memcached_return rc;
-    rc= memcached_do(ptr, server_key, "quit\r\n", 6, 1);
-    WATCHPOINT_ASSERT(rc == MEMCACHED_SUCCESS);
+    if (io_death == 0)
+    {
+      memcached_return rc;
+      rc= memcached_do(ptr, server_key, "quit\r\n", 6, 1);
+      WATCHPOINT_ASSERT(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_FETCH_NOTFINISHED);
+
+      memcached_io_close(ptr, server_key);
+    }
 
-    memcached_io_close(ptr, server_key);
     ptr->hosts[server_key].fd= -1;
-    ptr->hosts[server_key].stack_responses= 0;
-    ptr->hosts[server_key].cursor_active= 0;
     ptr->hosts[server_key].write_buffer_offset= 0;
     ptr->hosts[server_key].read_buffer_length= 0;
     ptr->hosts[server_key].read_ptr= ptr->hosts[server_key].read_buffer;
     ptr->hosts[server_key].write_ptr= ptr->hosts[server_key].write_buffer;
+    memcached_server_response_reset(ptr, server_key);
   }
 
   ptr->connected--;
@@ -39,10 +43,14 @@ void memcached_quit(memcached_st *ptr)
 {
   unsigned int x;
 
+  if (ptr->hosts == NULL || 
+      ptr->number_of_hosts == 0)
+    return;
+
   if (ptr->hosts && ptr->number_of_hosts)
   {
     for (x= 0; x < ptr->number_of_hosts; x++)
-      memcached_quit_server(ptr, x);
+      memcached_quit_server(ptr, x, 0);
   }
 
   ptr->connected= 0;