X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_connect.c;h=54316c59f90e677eae6752a7bedc45b318adfca0;hb=a9b22f8a1c9f98eef8becdbef11d8e20d43dd23c;hp=8c7ef3326332d10c442de800c24430a0e40e4a70;hpb=ea65554ea537786c7bc27018264f9e0d2ebd02ce;p=awesomized%2Flibmemcached diff --git a/libmemcached/memcached_connect.c b/libmemcached/memcached_connect.c index 8c7ef332..54316c59 100644 --- a/libmemcached/memcached_connect.c +++ b/libmemcached/memcached_connect.c @@ -13,7 +13,7 @@ static memcached_return set_hostinfo(memcached_server_st *server) memset(&hints, 0, sizeof(hints)); - hints.ai_family= AF_INET; + // hints.ai_family= AF_INET; if (server->type == MEMCACHED_CONNECTION_UDP) { hints.ai_protocol= IPPROTO_UDP; @@ -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) { + 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 */