Fixed bug reported by Stuart Midgley about what happens when there are no

[awesomized/libmemcached] / lib / memcached_quit.c

diff --git a/lib/memcached_quit.c b/lib/memcached_quit.c
index 8481b990e8a45e19831e44981b1571e73dc6c333..20a76e2915e3eb482c9db123f7c289ce4c56fb8a 100644 (file)
--- a/lib/memcached_quit.c
+++ b/lib/memcached_quit.c
@@ -1,24 +1,45 @@
-#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_st *ptr, unsigned int server_key)
+{
+  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->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->connected--;
+}
+
 void memcached_quit(memcached_st *ptr)
 {
   unsigned int x;
 
-  if (ptr->hosts)
+  if (ptr->hosts && ptr->number_of_hosts)
   {
     for (x= 0; x < ptr->number_of_hosts; x++)
-    {
-      if (ptr->hosts[x].fd != -1)
-      {
-        close(ptr->hosts[x].fd);
-        ptr->hosts[x].fd= -1;
-      }
-    }
+      memcached_quit_server(ptr, x);
   }
 
   ptr->connected= 0;