X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_quit.c;h=80b9314ac593a2350c28ae925579d42b13566fac;hb=cf90b27f7a3a7f117976ffc3ad538c870b85c82e;hp=9749b848306cafaae7b15c693196dd728e0cedf0;hpb=91e5a2590a918ee7718023d99cc23692d5b2da23;p=m6w6%2Flibmemcached

diff --git a/libmemcached/memcached_quit.c b/libmemcached/memcached_quit.c
index 9749b848..80b9314a 100644
--- a/libmemcached/memcached_quit.c
+++ b/libmemcached/memcached_quit.c
@@ -13,15 +13,25 @@ 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);
-      WATCHPOINT_ASSERT(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_FETCH_NOTFINISHED);
+      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
        * closing the socket before all data is read
        * results in server throwing away all data which is
@@ -31,10 +41,10 @@ void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death)
 	      memcached_io_read(ptr, buffer, sizeof(buffer)/sizeof(*buffer)))
 	     > 0);
     }
-    memcached_io_close(ptr, io_death);
+    memcached_io_close(ptr);
 
     ptr->fd= -1;
-    ptr->write_buffer_offset= 0;
+    ptr->write_buffer_offset= (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);