Merge in build lp

[awesomized/libmemcached] / libmemcached / memcached.hpp

diff --git a/libmemcached/memcached.hpp b/libmemcached/memcached.hpp
index 0b27291b095ca3f76dd908759900fe2325baf1f4..58fff4df7fcc0401f8b2c738bf32d51cf96cb5cb 100644 (file)
--- a/libmemcached/memcached.hpp
+++ b/libmemcached/memcached.hpp
@@ -117,7 +117,17 @@ public:
    */
   bool configure(const std::string &configuration)
   {
-    return memcached_success(memcached_parse_configuration(memc, configuration.c_str(), configuration.size()));
+    memcached_st *new_memc= memcached(configuration.c_str(), configuration.size());
+
+    if (new_memc)
+    {
+      memcached_free(memc);
+      memc= new_memc;
+
+      return true;
+    }
+
+    return false;
   }
 
   /**