Trying to remove branch

[m6w6/libmemcached] / lib / memcached_quit.c

diff --git a/lib/memcached_quit.c b/lib/memcached_quit.c
index a0cc617299962c4eacaeda28609c5d5e04d342cb..9874bb6ea45f66ad9a1876dabf7ae729ea53e633 100644 (file)
--- a/lib/memcached_quit.c
+++ b/lib/memcached_quit.c
@@ -9,42 +9,52 @@
   will force data to be completed.
 */
 
-void memcached_quit_server(memcached_st *ptr, unsigned int server_key)
+void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death)
 {
-  if (ptr->hosts == NULL || 
-      ptr->number_of_hosts == 0 ||
-      server_key > ptr->number_of_hosts)
-    return;
-
-  if (ptr->hosts[server_key].fd != -1)
+  if (ptr->fd != -1)
   {
-    if (ptr->flags & MEM_NO_BLOCK && ptr->hosts[server_key].stack_responses)
-      memcached_io_flush(ptr, server_key);
-
-    memcached_io_write(ptr, server_key, "quit\r\n", 6, 1);
-
-    close(ptr->hosts[server_key].fd);
-    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;
+    if (io_death == 0)
+    {
+      memcached_return rc;
+      ssize_t read_length;
+      char buffer[MEMCACHED_MAX_BUFFER];
+
+      rc= memcached_do(ptr, "quit\r\n", 6, 1);
+      WATCHPOINT_ASSERT(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_FETCH_NOTFINISHED);
+
+      /* read until socket is closed, or there is an error
+       * closing the socket before all data is read
+       * results in server throwing away all data which is
+       * not read
+       */
+      while ((read_length=
+             memcached_io_read(ptr, buffer, sizeof(buffer)/sizeof(*buffer)))
+            > 0)
+       {
+         ;
+       }
+      memcached_io_close(ptr);
+    }
+
+    ptr->fd= -1;
+    ptr->write_buffer_offset= 0;
+    ptr->read_buffer_length= 0;
+    ptr->read_ptr= ptr->read_buffer;
+    memcached_server_response_reset(ptr);
   }
-
-  ptr->connected--;
 }
 
 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->hosts[x], 0);
   }
-
-  ptr->connected= 0;
 }