Merge Jean-Charles

diff --git a/ChangeLog b/ChangeLog
index 35a900113c918be16eb0a292a7151435ab4fee98..53f776c092c23210555bb1a81aaae7c3f8cb0df7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+0.38
+
+ * memcached_purge() now calls any callbacks registered during get
+   execution.
+
 0.37 Mon Jan 11 16:29:57 PST 2010
  * Fixed build for libhashkit.
  * Fixed install path regression.  

diff --git a/libmemcached/purge.c b/libmemcached/purge.c
index d37526db73674a05ca0c7e4c3ab1ce2c5ef22c45..6780c54f115e28eb402a5b99011655647aab08e9 100644 (file)
--- a/libmemcached/purge.c
+++ b/libmemcached/purge.c
@@ -63,6 +63,20 @@ memcached_return_t memcached_purge(memcached_server_instance_st *ptr)
         ret = rc;
         memcached_io_reset(ptr);
       }
+
+      if (ptr->root->callbacks != NULL)
+      {
+        memcached_callback_st cb = *ptr->root->callbacks;
+        if (rc == MEMCACHED_SUCCESS)
+        {
+          for (uint32_t y= 0; y < cb.number_of_callback; y++)
+          {
+            rc = (*cb.callback[y])(ptr->root, result_ptr, cb.context);
+            if (rc != MEMCACHED_SUCCESS)
+              break;
+          }
+        }
+      }
     }
 
     memcached_result_free(result_ptr);