X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=libmemcached%2Fmemcached_quit.c;h=80b9314ac593a2350c28ae925579d42b13566fac;hb=baf931721d1b37ac06ea5126ac038cca2d413d91;hp=c30b1ccdfc6923a91734deeb954b2c9598fff352;hpb=fa9671f1d156abd1aaa9b913f62fce14fe7f96e0;p=awesomized%2Flibmemcached diff --git a/libmemcached/memcached_quit.c b/libmemcached/memcached_quit.c index c30b1ccd..80b9314a 100644 --- a/libmemcached/memcached_quit.c +++ b/libmemcached/memcached_quit.c @@ -13,7 +13,7 @@ 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; @@ -26,7 +26,8 @@ void memcached_quit_server(memcached_server_st *ptr, uint8_t io_death) 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 + } + else rc= memcached_do(ptr, "quit\r\n", 6, 1); WATCHPOINT_ASSERT(rc == MEMCACHED_SUCCESS || rc == MEMCACHED_FETCH_NOTFINISHED); @@ -40,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);