X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_connect.c;h=de69e4465ef8c68e34d608f4bace32d4d0cd5042;hb=7577cb0a57aa70d9857d42c381f13c7cb60d0056;hp=f2549dc75157877fb23a8e79244a7e2b465298e4;hpb=b34c702fa781b33f8a1f7751385929122c3e6bae;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memcached_connect.c b/libmemcached/memcached_connect.c
index f2549dc7..de69e446 100644
--- a/libmemcached/memcached_connect.c
+++ b/libmemcached/memcached_connect.c
@@ -34,7 +34,10 @@ static memcached_return set_hostinfo(memcached_server_st *server)
   }
 
   if (server->address_info)
+  {
     freeaddrinfo(server->address_info);
+    server->address_info= NULL;
+  }
   server->address_info= ai;
 
   return MEMCACHED_SUCCESS;
@@ -172,9 +175,12 @@ static memcached_return network_connect(memcached_server_st *ptr)
   {
     struct addrinfo *use;
 
-    if(ptr->root->server_failure_limit != 0) {
-      if(ptr->server_failure_counter >= ptr->root->server_failure_limit) {
-          server_remove(ptr);
+    if (ptr->root->server_failure_limit != 0) 
+    {
+      if (ptr->server_failure_counter >= ptr->root->server_failure_limit) 
+      {
+          memcached_server_remove(ptr);
+          return MEMCACHED_FAILURE;
       }
     }
     /* Old connection junk still is in the structure */