X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fquit.cc;h=2cfc44b56dab85abc371502d818ddca1f1caa317;hb=5aa178162af4134264e1c1e794e8b196bdd0d802;hp=f228c881d9657778859e7a33af8532ba77c1c8d2;hpb=70f02eac18862c95ebe45e1b410904910281be6c;p=m6w6%2Flibmemcached

diff --git a/libmemcached/quit.cc b/libmemcached/quit.cc
index f228c881..2cfc44b5 100644
--- a/libmemcached/quit.cc
+++ b/libmemcached/quit.cc
@@ -62,7 +62,7 @@ void memcached_quit_server(memcached_server_st *ptr, bool io_death)
         request.message.header.request.opcode = PROTOCOL_BINARY_CMD_QUIT;
         request.message.header.request.datatype = PROTOCOL_BINARY_RAW_BYTES;
 
-        struct libmemcached_io_vector_st vector[]=
+        libmemcached_io_vector_st vector[]=
         {
           { request.bytes, sizeof(request.bytes) }
         };
@@ -71,7 +71,7 @@ void memcached_quit_server(memcached_server_st *ptr, bool io_death)
       }
       else
       {
-        struct libmemcached_io_vector_st vector[]=
+        libmemcached_io_vector_st vector[]=
         {
           { memcached_literal_param("quit\r\n") }
         };
@@ -79,8 +79,6 @@ void memcached_quit_server(memcached_server_st *ptr, bool io_death)
         rc= memcached_vdo(ptr, vector, 1, true);
       }
 
-      WATCHPOINT_ASSERT(rc == MEMCACHED_SUCCESS or rc == MEMCACHED_FETCH_NOTFINISHED);
-
       /* 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
@@ -89,11 +87,18 @@ void memcached_quit_server(memcached_server_st *ptr, bool io_death)
        * In .40 we began to only do this if we had been doing buffered
        * requests of had replication enabled.
        */
-      if (ptr->root->flags.buffer_requests or ptr->root->number_of_replicas)
+      if (memcached_success(rc) and (ptr->root->flags.buffer_requests or ptr->root->number_of_replicas))
       {
-        memcached_return_t rc_slurp;
-        while (memcached_continue(rc_slurp= memcached_io_slurp(ptr))) {} ;
-        WATCHPOINT_ASSERT(rc_slurp == MEMCACHED_CONNECTION_FAILURE);
+        if (0)
+        {
+          memcached_return_t rc_slurp;
+          while (memcached_continue(rc_slurp= memcached_io_slurp(ptr))) {} ;
+          WATCHPOINT_ASSERT(rc_slurp == MEMCACHED_CONNECTION_FAILURE);
+        }
+        else
+        {
+          memcached_io_slurp(ptr);
+        }
       }
 
       /*