X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fquit.c;h=18a9a316956f6aa3ce676289353eec3221620c9e;hb=671ca37a89bd48331316cb98c3f54ce1bca7ef88;hp=292bc6e43442f6158287b1e54c7a3a6fa38ae96d;hpb=70c3fdd7d6d441a8be3e831f6a0aa3ae88166bc6;p=m6w6%2Flibmemcached

diff --git a/libmemcached/quit.c b/libmemcached/quit.c
index 292bc6e4..18a9a316 100644
--- a/libmemcached/quit.c
+++ b/libmemcached/quit.c
@@ -30,7 +30,7 @@ void memcached_quit_server(memcached_server_st *ptr, bool io_death)
       }
       else
       {
-        rc= memcached_do(ptr, "quit\r\n", sizeof("quit\r\n"), true);
+        rc= memcached_do(ptr, "quit\r\n", strlen("quit\r\n"), true);
       }
 
       WATCHPOINT_ASSERT(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_FETCH_NOTFINISHED);
@@ -40,10 +40,17 @@ void memcached_quit_server(memcached_server_st *ptr, bool io_death)
        * closing the socket before all data is read
        * results in server throwing away all data which is
        * not read
+       *
+       * In .40 we began to only do this if we had been doing buffered
+       * requests of had replication enabled.
        */
-      ssize_t nread;
-      while (memcached_io_read(ptr, buffer, sizeof(buffer)/sizeof(*buffer),
-                               &nread) == MEMCACHED_SUCCESS);
+      if (ptr->root->flags.buffer_requests || ptr->root->number_of_replicas)
+      {
+        ssize_t nread;
+        while (memcached_io_read(ptr, buffer, sizeof(buffer)/sizeof(*buffer),
+                                 &nread) == MEMCACHED_SUCCESS);
+      }
+
 
       /*
        * memcached_io_read may call memcached_quit_server with io_death if
@@ -67,6 +74,7 @@ void memcached_quit_server(memcached_server_st *ptr, bool io_death)
   if (io_death)
   {
     ptr->server_failure_counter++;
+    set_last_disconnected_host(ptr);
   }
 }
 
@@ -81,7 +89,7 @@ void memcached_quit(memcached_st *ptr)
   {
     for (x= 0; x < memcached_server_count(ptr); x++)
     {
-      memcached_server_instance_st *instance=
+      memcached_server_write_instance_st instance=
         memcached_server_instance_fetch(ptr, x);
 
       memcached_quit_server(instance, false);