X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_quit.c;h=860ee126625a54725758c400dc2284d8680cbd8e;hb=94cd1cbfb3fe6d0c446be9151ae9b15f775b6511;hp=b764cd1bf318ab6bdb41121ef80dd10a4b40ef2c;hpb=d56b89f5a14364b6b8ec0730b6833fbe15487f1c;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memcached_quit.c b/libmemcached/memcached_quit.c
index b764cd1b..860ee126 100644
--- a/libmemcached/memcached_quit.c
+++ b/libmemcached/memcached_quit.c
@@ -2,10 +2,10 @@
 
 /*
   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 
+
+  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.
 */
 
@@ -13,13 +13,22 @@ void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death)
 {
   if (ptr->fd != -1)
   {
-    if (io_death == 0)
+    if (io_death == 0 && ptr->type != MEMCACHED_CONNECTION_UDP)
     {
       memcached_return rc;
-      ssize_t read_length;
       char buffer[MEMCACHED_MAX_BUFFER];
 
-      rc= memcached_do(ptr, "quit\r\n", 6, 1);
+      if (ptr->root->flags & MEM_BINARY_PROTOCOL)
+      {
+        protocol_binary_request_quit request = {.bytes= {0}};
+        request.message.header.request.magic = PROTOCOL_BINARY_REQ;
+        request.message.header.request.opcode = PROTOCOL_BINARY_CMD_QUIT;
+        request.message.header.request.datatype = PROTOCOL_BINARY_RAW_BYTES;
+        rc= memcached_do(ptr, request.bytes, sizeof(request.bytes), 1);
+      }
+      else
+        rc= memcached_do(ptr, "quit\r\n", 6, 1);
+
       WATCHPOINT_ASSERT(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_FETCH_NOTFINISHED);
 
       /* read until socket is closed, or there is an error
@@ -27,28 +36,27 @@ void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death)
        * results in server throwing away all data which is
        * not read
        */
-      while ((read_length=
-	      memcached_io_read(ptr, buffer, sizeof(buffer)/sizeof(*buffer)))
-	     > 0)
-	{
-	  ;
-	}
+      ssize_t nread;
+      while (memcached_io_read(ptr, buffer, sizeof(buffer)/sizeof(*buffer),
+                               &nread) == MEMCACHED_SUCCESS);
     }
     memcached_io_close(ptr);
 
     ptr->fd= -1;
-    ptr->write_buffer_offset= 0;
+    ptr->write_buffer_offset= (size_t) ((ptr->type == MEMCACHED_CONNECTION_UDP) ? UDP_DATAGRAM_HEADER_LENGTH : 0);
     ptr->read_buffer_length= 0;
     ptr->read_ptr= ptr->read_buffer;
     memcached_server_response_reset(ptr);
   }
+
+  if(io_death) ptr->server_failure_counter++;
 }
 
 void memcached_quit(memcached_st *ptr)
 {
   unsigned int x;
 
-  if (ptr->hosts == NULL || 
+  if (ptr->hosts == NULL ||
       ptr->number_of_hosts == 0)
     return;