Update yatl.

[awesomized/libmemcached] / libmemcached / connect.cc

diff --git a/libmemcached/connect.cc b/libmemcached/connect.cc
index fa4b7317c02ad4324f9b46711418fc312e9388fb..d6dca966140cf787d1e6529bb458e44aaed5754f 100644 (file)
--- a/libmemcached/connect.cc
+++ b/libmemcached/connect.cc
@@ -206,12 +206,6 @@ static memcached_return_t set_hostinfo(org::libmemcached::Instance* server)
     break;
 
   case EAI_AGAIN:
-    if (server->address_info)
-    {
-      freeaddrinfo(server->address_info);
-      server->address_info= NULL;
-      server->address_info_next= NULL;
-    }
     return memcached_set_error(*server, MEMCACHED_TIMEOUT, MEMCACHED_AT, memcached_string_make_from_cstr(gai_strerror(errcode)));
 
   case EAI_SYSTEM:
@@ -631,6 +625,9 @@ static memcached_return_t network_connect(org::libmemcached::Instance* server)
       server->fd= INVALID_SOCKET;
       continue;
 
+    case ECONNREFUSED:
+      // Probably not running service
+
     default:
       break;
     }
@@ -830,16 +827,6 @@ static memcached_return_t _memcached_connect(org::libmemcached::Instance* server
   return rc;
 }
 
-memcached_return_t memcached_connect_try(org::libmemcached::Instance* server)
-{
-  if (server and server->root and server->root->state.is_parsing)
-  {
-    return MEMCACHED_SUCCESS;
-  }
-
-  return _memcached_connect(server, false);
-}
-
 memcached_return_t memcached_connect(org::libmemcached::Instance* server)
 {
   return _memcached_connect(server, true);