Fix for bad disconnect during test run.

[awesomized/libmemcached] / libmemcached / memcached_connect.c

diff --git a/libmemcached/memcached_connect.c b/libmemcached/memcached_connect.c
index 4cd5219afebabb90689bb6c1fcf6e5a749138cb6..12f4affd9ed6f31469689a23c8f55780a193ed82 100644 (file)
--- a/libmemcached/memcached_connect.c
+++ b/libmemcached/memcached_connect.c
@@ -46,6 +46,8 @@ static memcached_return set_hostinfo(memcached_server_st *server)
 
 static memcached_return set_socket_options(memcached_server_st *ptr)
 {
+  WATCHPOINT_ASSERT(ptr->fd != -1);
+
   if (ptr->type == MEMCACHED_CONNECTION_UDP)
     return MEMCACHED_SUCCESS;
 
@@ -167,6 +169,8 @@ test_connect:
       }
     }
   }
+
+  WATCHPOINT_ASSERT(ptr->fd != -1);
   return MEMCACHED_SUCCESS;
 }
 
@@ -239,13 +243,7 @@ test_connect:
               ptr->cached_errno= errno;
               WATCHPOINT_ERRNO(ptr->cached_errno);
               WATCHPOINT_NUMBER(ptr->root->connect_timeout);
-              close(ptr->fd);
-              ptr->fd= -1;
-              if (ptr->address_info)
-              {
-                freeaddrinfo(ptr->address_info);
-                ptr->address_info= NULL;
-              }
+              memcached_quit_server(ptr, 1);
 
               if (ptr->root->retry_timeout)
               {
@@ -255,6 +253,7 @@ test_connect:
                 ptr->next_retry= next_time.tv_sec + ptr->root->retry_timeout;
               }
               ptr->server_failure_counter+= 1;
+
               return MEMCACHED_ERRNO;
             }