X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_quit.c;h=366f7872cd76a229a3d547eb43e43ca683e8c691;hb=2c213592852ceb196be1b1760d17284150fc0678;hp=24a88c2d9c0d2d2ce56ef4ac6c0a59c2b3b65084;hpb=5672a07389f0e0ea5dc4858c02ac3f3bc7ecf3f7;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_quit.c b/lib/memcached_quit.c
index 24a88c2d..366f7872 100644
--- a/lib/memcached_quit.c
+++ b/lib/memcached_quit.c
@@ -1,21 +1,46 @@
-#include <memcached.h>
+#include "common.h"
 
 /*
   This closes all connections (forces flush of input as well).
   
   Maybe add a host specific, or key specific version? 
+  
+  The reason we send "quit" is that in case we have buffered IO, this 
+  will force data to be completed.
 */
+
+void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death)
+{
+  if (ptr->fd != -1)
+  {
+    if (io_death == 0)
+    {
+      memcached_return rc;
+      rc= memcached_do(ptr, "quit\r\n", 6, 1);
+      WATCHPOINT_ASSERT(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_FETCH_NOTFINISHED);
+
+      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);
+  }
+}
+
 void memcached_quit(memcached_st *ptr)
 {
   unsigned int x;
 
-  if (ptr->hosts)
+  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++)
-    {
-      if (ptr->hosts[x].fd > 0)
-        close(ptr->hosts[x].fd);
-    }
+      memcached_quit_server(&ptr->hosts[x], 0);
   }
-  ptr->connected= 0;
 }