X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.cc;fp=libmemcached%2Fmemcached.cc;h=1726b35fce634d7117bdd8244d6549200820fecb;hb=fbdda95bad712d301373b64193eb3ca00f281e55;hp=62052ada5ac25ec75bbd6759d6fb37567aa9cfab;hpb=64e070cda2cc99513fdbaae770a473d5338c9378;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memcached.cc b/libmemcached/memcached.cc
index 62052ada..1726b35f 100644
--- a/libmemcached/memcached.cc
+++ b/libmemcached/memcached.cc
@@ -96,6 +96,7 @@ static inline bool _memcached_init(memcached_st *self)
   self->poll_timeout= MEMCACHED_DEFAULT_TIMEOUT;
   self->connect_timeout= MEMCACHED_DEFAULT_CONNECT_TIMEOUT;
   self->retry_timeout= MEMCACHED_SERVER_FAILURE_RETRY_TIMEOUT;
+  self->dead_timeout= MEMCACHED_SERVER_FAILURE_DEAD_TIMEOUT;
 
   self->send_size= -1;
   self->recv_size= -1;
@@ -234,7 +235,7 @@ memcached_st *memcached(const char *string, size_t length)
 memcached_return_t memcached_reset(memcached_st *ptr)
 {
   WATCHPOINT_ASSERT(ptr);
-  if (not ptr)
+  if (ptr == NULL)
   {
     return MEMCACHED_INVALID_ARGUMENTS;
   }
@@ -314,6 +315,7 @@ memcached_st *memcached_clone(memcached_st *clone, const memcached_st *source)
   new_clone->poll_timeout= source->poll_timeout;
   new_clone->connect_timeout= source->connect_timeout;
   new_clone->retry_timeout= source->retry_timeout;
+  new_clone->dead_timeout= source->dead_timeout;
   new_clone->distribution= source->distribution;
 
   if (hashkit_clone(&new_clone->hashkit, &source->hashkit) == NULL)