X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.c;h=2efcc7d5f713042f3401e68612e11b7b6887df18;hb=073c4085895027aabe10aec9264dd8f4dae7e264;hp=2c8cef75b61c5926bde3ec40128b7cc6595769c1;hpb=eb59b82618de62fba5bdd833a4c82fbefa9546af;p=m6w6%2Flibmemcached diff --git a/libmemcached/memcached.c b/libmemcached/memcached.c index 2c8cef75..2efcc7d5 100644 --- a/libmemcached/memcached.c +++ b/libmemcached/memcached.c @@ -41,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) @@ -103,6 +111,21 @@ memcached_st *memcached_clone(memcached_st *clone, memcached_st *ptr) 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);