X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.c;h=40f8e263e7f7f478d579de9a8e74ff26503e2fbe;hb=f859a9f36f4eb8df12faea8005b26eb75b1265d6;hp=31c12ab3158bc52af7665376171816157f27e3c5;hpb=8fce86636639afaeac4ca0e869e8bcd833324a62;p=m6w6%2Flibmemcached

diff --git a/libmemcached/memcached.c b/libmemcached/memcached.c
index 31c12ab3..40f8e263 100644
--- a/libmemcached/memcached.c
+++ b/libmemcached/memcached.c
@@ -24,6 +24,8 @@ memcached_st *memcached_create(memcached_st *ptr)
   result_ptr= memcached_result_create(ptr, &ptr->result);
   WATCHPOINT_ASSERT(result_ptr);
   ptr->poll_timeout= MEMCACHED_DEFAULT_TIMEOUT;
+  ptr->connect_timeout= MEMCACHED_DEFAULT_TIMEOUT;
+  ptr->retry_timeout= 0;
   ptr->distribution= MEMCACHED_DISTRIBUTION_MODULA;
 
   return ptr;
@@ -39,6 +41,14 @@ void memcached_free(memcached_st *ptr)
   if (ptr->on_cleanup)
     ptr->on_cleanup(ptr);
 
+  if (ptr->continuum)
+  {
+    if (ptr->call_free)
+      ptr->call_free(ptr, ptr->continuum);
+    else
+      free(ptr->continuum);
+  }
+
   if (ptr->is_allocated == MEMCACHED_ALLOCATED)
   {
     if (ptr->call_free)
@@ -89,15 +99,37 @@ memcached_st *memcached_clone(memcached_st *clone, memcached_st *ptr)
   new_clone->send_size= ptr->send_size;
   new_clone->recv_size= ptr->recv_size;
   new_clone->poll_timeout= ptr->poll_timeout;
+  new_clone->connect_timeout= ptr->connect_timeout;
+  new_clone->retry_timeout= ptr->retry_timeout;
   new_clone->distribution= ptr->distribution;
   new_clone->hash= ptr->hash;
+  new_clone->hash_continuum= ptr->hash_continuum;
   new_clone->user_data= ptr->user_data;
 
+  new_clone->snd_timeout= ptr->snd_timeout;
+  new_clone->rcv_timeout= ptr->rcv_timeout;
+
   new_clone->on_clone= ptr->on_clone;
   new_clone->on_cleanup= ptr->on_cleanup;
   new_clone->call_free= ptr->call_free;
   new_clone->call_malloc= ptr->call_malloc;
   new_clone->call_realloc= ptr->call_realloc;
+  new_clone->get_key_failure= ptr->get_key_failure;
+  new_clone->delete_trigger= ptr->delete_trigger;
+
+  if (ptr->prefix_key[0] != 0)
+  {
+    strcpy(new_clone->prefix_key, ptr->prefix_key);
+    new_clone->prefix_key_length= ptr->prefix_key_length;
+  }
+
+  rc= run_distribution(new_clone);
+  if (rc != MEMCACHED_SUCCESS)
+  {
+    memcached_free(new_clone);
+
+    return NULL;
+  }
 
   if (ptr->on_clone)
     ptr->on_clone(ptr, new_clone);