X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fconnect.cc;h=52cd293a64c7b0827e79bc970c8dfb7e4d1fcdeb;hb=00270ce6ef11e69d87b6595288403cfa9cf9cad8;hp=659d34078ce2f168523186b447c4ba6db4775cba;hpb=159d85141f157810f5a7d388658fc6923067041e;p=awesomized%2Flibmemcached

diff --git a/libmemcached/connect.cc b/libmemcached/connect.cc
index 659d3407..52cd293a 100644
--- a/libmemcached/connect.cc
+++ b/libmemcached/connect.cc
@@ -76,7 +76,7 @@ static memcached_return_t connect_poll(memcached_instance_st* server, const int
   if (server->root->poll_timeout == 0)
   {
     return memcached_set_error(*server, MEMCACHED_TIMEOUT, MEMCACHED_AT,
-                               memcached_literal_param("The time to wait for a connection to be established was set to zero, which means it will always timeout (MEMCACHED_TIMEOUT)."));
+                               memcached_literal_param("The time to wait for a connection to be established was set to zero which produces a timeout to every call to poll()."));
   }
 
   while (--loop_max) // Should only loop on cases of ERESTART or EINTR
@@ -198,7 +198,7 @@ static memcached_return_t set_hostinfo(memcached_instance_st* server)
   struct addrinfo hints;
   memset(&hints, 0, sizeof(struct addrinfo));
 
-  hints.ai_family= AF_INET;
+  hints.ai_family= AF_UNSPEC;
   if (memcached_is_udp(server->root))
   {
     hints.ai_protocol= IPPROTO_UDP;
@@ -713,6 +713,7 @@ static memcached_return_t backoff_handling(memcached_instance_st* server, bool&
     if (_gettime_success and server->next_retry < curr_time.tv_sec)
     {
       server->state= MEMCACHED_SERVER_STATE_NEW;
+      server->server_timeout_counter= 0;
     }
     else
     {
@@ -760,7 +761,7 @@ static memcached_return_t _memcached_connect(memcached_instance_st* server, cons
   case MEMCACHED_CONNECTION_TCP:
     rc= network_connect(server);
 
-#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
+#if defined(LIBMEMCACHED_WITH_SASL_SUPPORT)
     if (LIBMEMCACHED_WITH_SASL_SUPPORT)
     {
       if (server->fd != INVALID_SOCKET and server->root->sasl.callbacks)