X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_quit.c;h=9874bb6ea45f66ad9a1876dabf7ae729ea53e633;hb=0d688cec9e53a2ed8e3f3817da9aecdd41d342ca;hp=fdc86b6c7abce98d86c9b4dab90a4d49693cece4;hpb=b1d5d8be2237f04ccc99939399ebe7efad3f684e;p=awesomized%2Flibmemcached

diff --git a/lib/memcached_quit.c b/lib/memcached_quit.c
index fdc86b6c..9874bb6e 100644
--- a/lib/memcached_quit.c
+++ b/lib/memcached_quit.c
@@ -9,34 +9,39 @@
   will force data to be completed.
 */
 
-void memcached_quit_server(memcached_st *ptr, unsigned int server_key, uint8_t io_death)
+void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death)
 {
-  if (server_key > ptr->number_of_hosts)
-  {
-    WATCHPOINT_ASSERT(0);
-    return;
-  }
-
-  if (ptr->hosts[server_key].fd != -1)
+  if (ptr->fd != -1)
   {
     if (io_death == 0)
     {
       memcached_return rc;
-      rc= memcached_do(ptr, server_key, "quit\r\n", 6, 1);
+      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);
 
-      memcached_io_close(ptr, server_key);
+      /* 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->hosts[server_key].fd= -1;
-    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->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)
@@ -50,8 +55,6 @@ void memcached_quit(memcached_st *ptr)
   if (ptr->hosts && ptr->number_of_hosts)
   {
     for (x= 0; x < ptr->number_of_hosts; x++)
-      memcached_quit_server(ptr, x, 0);
+      memcached_quit_server(&ptr->hosts[x], 0);
   }
-
-  ptr->connected= 0;
 }