diff '--unified=5' -r libmemcached-1.0.18/libmemcached/instance.cc libmemcached-1.0.18-close_socket-fix/libmemcached/instance.cc
--- libmemcached-1.0.18/libmemcached/instance.cc	2014-02-09 06:52:42.000000000 -0500
+++ libmemcached-1.0.18-close_socket-fix/libmemcached/instance.cc	2014-07-08 16:41:40.503295255 -0400
@@ -66,11 +66,10 @@
   self->minor_version= UINT8_MAX;
   self->type= type;
   self->error_messages= NULL;
   self->read_ptr= self->read_buffer;
   self->read_buffer_length= 0;
-  self->read_data_length= 0;
   self->write_buffer_offset= 0;
   self->address_info= NULL;
   self->address_info_next= NULL;
 
   self->state= MEMCACHED_SERVER_STATE_NEW;
Only in libmemcached-1.0.18-close_socket-fix/libmemcached: instance.cc~
diff '--unified=5' -r libmemcached-1.0.18/libmemcached/instance.hpp libmemcached-1.0.18-close_socket-fix/libmemcached/instance.hpp
--- libmemcached-1.0.18/libmemcached/instance.hpp	2014-02-09 06:52:42.000000000 -0500
+++ libmemcached-1.0.18-close_socket-fix/libmemcached/instance.hpp	2014-07-08 16:41:26.251294933 -0400
@@ -163,11 +163,10 @@
   uint8_t micro_version; // ditto, and note that this is the third, not second version bit
   uint8_t minor_version; // ditto
   memcached_connection_t type;
   char *read_ptr;
   size_t read_buffer_length;
-  size_t read_data_length;
   size_t write_buffer_offset;
   struct addrinfo *address_info;
   struct addrinfo *address_info_next;
   time_t next_retry;
   struct memcached_st *root;
Only in libmemcached-1.0.18-close_socket-fix/libmemcached: instance.hpp~
diff '--unified=5' -r libmemcached-1.0.18/libmemcached/io.cc libmemcached-1.0.18-close_socket-fix/libmemcached/io.cc
--- libmemcached-1.0.18/libmemcached/io.cc	2014-02-09 06:52:42.000000000 -0500
+++ libmemcached-1.0.18-close_socket-fix/libmemcached/io.cc	2014-07-08 16:41:16.843294721 -0400
@@ -68,22 +68,21 @@
     /* Move all of the data to the beginning of the buffer so
      ** that we can fit more data into the buffer...
    */
     memmove(instance->read_buffer, instance->read_ptr, instance->read_buffer_length);
     instance->read_ptr= instance->read_buffer;
-    instance->read_data_length= instance->read_buffer_length;
   }
 
   /* There is room in the buffer, try to fill it! */
   if (instance->read_buffer_length != MEMCACHED_MAX_BUFFER)
   {
     do {
       /* Just try a single read to grab what's available */
       ssize_t nr;
       if ((nr= ::recv(instance->fd,
-                      instance->read_ptr + instance->read_data_length,
-                      MEMCACHED_MAX_BUFFER - instance->read_data_length,
+                      instance->read_ptr + instance->read_buffer_length,
+                      MEMCACHED_MAX_BUFFER - instance->read_buffer_length,
                       MSG_NOSIGNAL)) <= 0)
       {
         if (nr == 0)
         {
           memcached_set_error(*instance, MEMCACHED_CONNECTION_FAILURE, MEMCACHED_AT);
@@ -111,11 +110,10 @@
 
         break;
       }
       else // We read data, append to our read buffer
       {
-        instance->read_data_length+= size_t(nr);
         instance->read_buffer_length+= size_t(nr);
 
         return true;
       }
     } while (false);
@@ -486,11 +484,10 @@
     }
     instance->io_wait_count._bytes_read+= data_read;
   } while (data_read <= 0);
 
   instance->io_bytes_sent= 0;
-  instance->read_data_length= (size_t) data_read;
   instance->read_buffer_length= (size_t) data_read;
   instance->read_ptr= instance->read_buffer;
 
   return MEMCACHED_SUCCESS;
 }
Only in libmemcached-1.0.18-close_socket-fix/libmemcached: io.cc~