{
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];
if (ptr->root->flags & MEM_BINARY_PROTOCOL)
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);
* 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= (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);
}
+
+ ptr->server_failure_counter++;
}
void memcached_quit(memcached_st *ptr)