X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.c;h=81895afab67b19102b9e4418ee1890663cf4128c;hb=671ca37a89bd48331316cb98c3f54ce1bca7ef88;hp=5ffaee9e34ba0f243289e29bd7d32b08bebd0db6;hpb=c52c930e6cb28a0c48c63992135691111fd9f779;p=m6w6%2Flibmemcached

diff --git a/libmemcached/memcached.c b/libmemcached/memcached.c
index 5ffaee9e..81895afa 100644
--- a/libmemcached/memcached.c
+++ b/libmemcached/memcached.c
@@ -69,7 +69,7 @@ static inline bool _memcached_init(memcached_st *self)
   self->io_key_prefetch= 0;
   self->cached_errno= 0;
   self->poll_timeout= MEMCACHED_DEFAULT_TIMEOUT;
-  self->connect_timeout= MEMCACHED_DEFAULT_TIMEOUT;
+  self->connect_timeout= MEMCACHED_DEFAULT_CONNECT_TIMEOUT;
   self->retry_timeout= 0;
   self->continuum_count= 0;
 
@@ -92,10 +92,8 @@ static inline bool _memcached_init(memcached_st *self)
   self->get_key_failure= NULL;
   self->delete_trigger= NULL;
   self->callbacks= NULL;
-#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
   self->sasl.callbacks= NULL;
   self->sasl.is_allocated= false;
-#endif
 
   return true;
 }
@@ -154,6 +152,15 @@ void memcached_servers_reset(memcached_st *ptr)
   ptr->server_failure_limit= 0;
 }
 
+void memcached_reset_last_disconnected_server(memcached_st *ptr)
+{
+  if (ptr->last_disconnected_server)
+  {
+    memcached_server_free(ptr->last_disconnected_server);
+    ptr->last_disconnected_server= NULL;
+  }
+}
+
 void memcached_free(memcached_st *ptr)
 {
   /* If we have anything open, lets close it now */
@@ -170,12 +177,12 @@ void memcached_free(memcached_st *ptr)
   if (ptr->continuum)
     libmemcached_free(ptr, ptr->continuum);
 
-#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
-  if (ptr->sasl.callbacks != NULL)
+  if (ptr->sasl.callbacks)
   {
+#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
     memcached_destroy_sasl_auth_data(ptr);
-  }
 #endif
+  }
 
   if (memcached_is_allocated(ptr))
   {