X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_connect.c;h=ca35420066582efcf7d62cc18e24845ca4921fa8;hb=29c13aacae8a79791e8912ff7520601aa8136d83;hp=429e8ec66f581488efbefa920181e31efcea05bb;hpb=bdb7897b42e740471cc02589eda4434a09bbd330;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memcached_connect.c b/libmemcached/memcached_connect.c
index 429e8ec6..ca354200 100644
--- a/libmemcached/memcached_connect.c
+++ b/libmemcached/memcached_connect.c
@@ -51,6 +51,7 @@ static memcached_return set_socket_options(memcached_server_st *ptr)
   if (ptr->type == MEMCACHED_CONNECTION_UDP)
     return MEMCACHED_SUCCESS;
 
+#ifdef HAVE_SNDTIMEO
   if (ptr->root->snd_timeout)
   {
     int error;
@@ -63,7 +64,9 @@ static memcached_return set_socket_options(memcached_server_st *ptr)
                       &waittime, (socklen_t)sizeof(struct timeval));
     WATCHPOINT_ASSERT(error == 0);
   }
+#endif
 
+#ifdef HAVE_RCVTIMEO
   if (ptr->root->rcv_timeout)
   {
     int error;
@@ -76,6 +79,7 @@ static memcached_return set_socket_options(memcached_server_st *ptr)
                       &waittime, (socklen_t)sizeof(struct timeval));
     WATCHPOINT_ASSERT(error == 0);
   }
+#endif
 
   {
     int error;
@@ -189,7 +193,7 @@ static memcached_return network_connect(memcached_server_st *ptr)
       }
     }
 
-    if (ptr->sockaddr_inited == MEMCACHED_NOT_ALLOCATED || 
+    if (ptr->sockaddr_inited || 
         (!(ptr->root->flags & MEM_USE_CACHE_LOOKUPS)))
     {
       memcached_return rc;
@@ -197,7 +201,7 @@ static memcached_return network_connect(memcached_server_st *ptr)
       rc= set_hostinfo(ptr);
       if (rc != MEMCACHED_SUCCESS)
         return rc;
-      ptr->sockaddr_inited= MEMCACHED_ALLOCATED;
+      ptr->sockaddr_inited= true;
     }
 
     use= ptr->address_info;
@@ -238,18 +242,12 @@ test_connect:
             {
               goto handle_retry;
             }
-            else if (error != 1 || fds[0].revents & POLLERR)
+            else if (error != 1 && fds[0].revents & POLLERR)
             {
               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)
               {
@@ -259,6 +257,7 @@ test_connect:
                 ptr->next_retry= next_time.tv_sec + ptr->root->retry_timeout;
               }
               ptr->server_failure_counter+= 1;
+
               return MEMCACHED_ERRNO;
             }