X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_connect.c;h=278f9da3292710d91a553491b235c9e3606d8ece;hb=b1daf61bf1665041f30fff7c96d61de4658f8db3;hp=98d7630f589dd9194dbbd64cfb50887716404c70;hpb=af1f90c44906eb831ff632eba268236d1377058f;p=awesomized%2Flibmemcached

diff --git a/lib/memcached_connect.c b/lib/memcached_connect.c
index 98d7630f..278f9da3 100644
--- a/lib/memcached_connect.c
+++ b/lib/memcached_connect.c
@@ -10,7 +10,6 @@ static memcached_return set_hostinfo(memcached_server_st *server)
   sprintf(str_port, "%u", server->port);
 
   memset(&hints, 0, sizeof(hints));
-  hints.ai_family= AF_INET;
   hints.ai_socktype= SOCK_STREAM;
   hints.ai_protocol= 0;
 
@@ -77,7 +76,7 @@ static memcached_return udp_connect(memcached_st *ptr, unsigned int server_key)
   if (ptr->hosts[server_key].fd == -1)
   {
     /* Old connection junk still is in the structure */
-    WATCHPOINT_ASSERT(ptr->hosts[server_key].stack_responses == 0);
+    WATCHPOINT_ASSERT(ptr->hosts[server_key].cursor_active == 0);
 
     /*
       If we have not allocated the hosts object.
@@ -110,10 +109,11 @@ static memcached_return tcp_connect(memcached_st *ptr, unsigned int server_key)
 {
   if (ptr->hosts[server_key].fd == -1)
   {
-    /* Old connection junk still is in the structure */
-    WATCHPOINT_ASSERT(ptr->hosts[server_key].stack_responses == 0);
     struct addrinfo *use;
 
+    /* Old connection junk still is in the structure */
+    WATCHPOINT_ASSERT(ptr->hosts[server_key].cursor_active == 0);
+
     if (ptr->hosts[server_key].sockaddr_inited == MEMCACHED_NOT_ALLOCATED || 
         (!(ptr->flags & MEM_USE_CACHE_LOOKUPS)))
     {
@@ -218,12 +218,14 @@ test_connect:
       default:
         ptr->cached_errno= errno;
         WATCHPOINT_ERRNO(ptr->cached_errno);
+        close(ptr->hosts[server_key].fd);
+        ptr->hosts[server_key].fd= -1;
         return MEMCACHED_ERRNO;
       }
       ptr->connected++;
     }
 
-    WATCHPOINT_ASSERT(ptr->hosts[server_key].stack_responses == 0);
+    WATCHPOINT_ASSERT(ptr->hosts[server_key].cursor_active == 0);
   }
 
   return MEMCACHED_SUCCESS;