X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.c;h=40f8e263e7f7f478d579de9a8e74ff26503e2fbe;hb=6a9308726c72cb3df8a6fd8ac968f382d100a214;hp=b681f6cb42d9c03e6b5ab457d9a93e1d76c2620c;hpb=83d63a1f916b073f8cf44cf91b6c0b3d118dabe5;p=m6w6%2Flibmemcached

diff --git a/libmemcached/memcached.c b/libmemcached/memcached.c
index b681f6cb..40f8e263 100644
--- a/libmemcached/memcached.c
+++ b/libmemcached/memcached.c
@@ -49,14 +49,6 @@ void memcached_free(memcached_st *ptr)
       free(ptr->continuum);
   }
 
-  if (ptr->wheel)
-  {
-    if (ptr->call_free)
-      ptr->call_free(ptr, ptr->wheel);
-    else
-      free(ptr->wheel);
-  }
-
   if (ptr->is_allocated == MEMCACHED_ALLOCATED)
   {
     if (ptr->call_free)
@@ -111,8 +103,12 @@ memcached_st *memcached_clone(memcached_st *clone, memcached_st *ptr)
   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;
@@ -121,6 +117,12 @@ memcached_st *memcached_clone(memcached_st *clone, memcached_st *ptr)
   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)
   {