X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=libmemcached%2Fmemcached.c;h=d5411e86c0ba3becb6934e9981cbec2e36a859cf;hb=4effcb18b27e2d84a8b29bc311b5edbee3c004b6;hp=e6124493830f9fa31b8738512744f5ecbae0c265;hpb=d5c34fa54897336e3c92789d1abcceca8c5b213b;p=awesomized%2Flibmemcached diff --git a/libmemcached/memcached.c b/libmemcached/memcached.c index e6124493..d5411e86 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; @@ -151,6 +151,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 */