X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fquit.c;h=85eb3015696868746d667983434818fb8b6e90ec;hb=0b7de3f4c6b1e1e6e4db9837a7fbc976eb560799;hp=592373f60a8e5527db83c775e959d4c19961fe95;hpb=26c65ac524f21cd73a79f3caf45cdb76c9a41bc0;p=awesomized%2Flibmemcached

diff --git a/libmemcached/quit.c b/libmemcached/quit.c
index 592373f6..85eb3015 100644
--- a/libmemcached/quit.c
+++ b/libmemcached/quit.c
@@ -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
@@ -64,9 +71,14 @@ void memcached_quit_server(memcached_server_st *ptr, bool io_death)
   ptr->options.is_shutting_down= false;
   memcached_server_response_reset(ptr);
 
+  // We reset the version so that if we end up talking to a different server
+  // we don't have stale server version information.
+  ptr->major_version= ptr->minor_version= ptr->micro_version= UINT8_MAX;
+
   if (io_death)
   {
     ptr->server_failure_counter++;
+    set_last_disconnected_host(ptr);
   }
 }