- memcached_return rc;
- rc= memcached_do(ptr, server_key, "quit\r\n", 6, 1);
- WATCHPOINT_ASSERT(rc == MEMCACHED_SUCCESS);
-
- memcached_io_close(ptr, server_key);
- ptr->hosts[server_key].fd= -1;
- ptr->hosts[server_key].stack_responses= 0;
- ptr->hosts[server_key].cursor_active= 0;
- ptr->hosts[server_key].write_buffer_offset= 0;
- ptr->hosts[server_key].read_buffer_length= 0;
- ptr->hosts[server_key].read_ptr= ptr->hosts[server_key].read_buffer;
- ptr->hosts[server_key].write_ptr= ptr->hosts[server_key].write_buffer;
+ if (io_death == 0)
+ {
+ 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);
+
+ /* 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
+ * not read
+ */
+ while ((read_length=
+ memcached_io_read(ptr, buffer, sizeof(buffer)/sizeof(*buffer)))
+ > 0)
+ {
+ ;
+ }
+ memcached_io_close(ptr);
+ }
+
+ ptr->fd= -1;
+ ptr->write_buffer_offset= 0;
+ ptr->read_buffer_length= 0;
+ ptr->read_ptr= ptr->read_buffer;
+ memcached_server_response_reset(ptr);