X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_quit.c;h=3125abadfafe8ac8794e3f53f097b994519b3dd1;hb=2dce97932fbd574db1179add7bc3facc0318186c;hp=85a52861337be06720f576962ff0f677b5496546;hpb=311bd0fafe1da7b5cc770a2ff4fac5472a801a40;p=awesomized%2Flibmemcached

diff --git a/lib/memcached_quit.c b/lib/memcached_quit.c
index 85a52861..3125abad 100644
--- a/lib/memcached_quit.c
+++ b/lib/memcached_quit.c
@@ -9,20 +9,24 @@
   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 || rc == MEMCACHED_FETCH_NOTFINISHED);
-
-    memcached_io_close(ptr, server_key);
+    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);
+    }
     ptr->hosts[server_key].fd= -1;
     ptr->hosts[server_key].stack_responses= 0;
     ptr->hosts[server_key].cursor_active= 0;
@@ -38,11 +42,14 @@ void memcached_quit_server(memcached_st *ptr, unsigned int server_key)
 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;