Fix for connect() to invalidate socket on failure.

[m6w6/libmemcached] / lib / memcached_do.c

diff --git a/lib/memcached_do.c b/lib/memcached_do.c
index f310a5bc3f9306e46392e2fa691e3f278e3d32dc..cfc00ccdcc2683f44138fcae34706fa93a525b22 100644 (file)
--- a/lib/memcached_do.c
+++ b/lib/memcached_do.c
@@ -9,23 +9,15 @@ memcached_return memcached_do(memcached_st *ptr, unsigned int server_key, char *
   WATCHPOINT_ASSERT(command_length);
   WATCHPOINT_ASSERT(command);
 
-  if (ptr->hosts[server_key].cursor_active)
-  {
-    memcached_return rc;
-    rc= memcached_finish_server(ptr, server_key);
-    ptr->hosts[server_key].cursor_active= 0;
-  }
-
   if ((rc= memcached_connect(ptr, server_key)) != MEMCACHED_SUCCESS)
     return rc;
 
   sent_length= memcached_io_write(ptr, server_key, command, command_length, with_flush);
 
   if (sent_length == -1 || sent_length != command_length)
-  {
-    memcached_quit_server(ptr, server_key);
     rc= MEMCACHED_WRITE_FAILURE;
-  }
+  else
+    memcached_server_response_increment(ptr, server_key);
 
   return rc;
 }