Merge in 1.0.3

[m6w6/libmemcached] / libmemcached / key.cc

diff --git a/libmemcached/key.cc b/libmemcached/key.cc
index 02e0c2b326dbfcb51400c04e8c2c17c3a36dd58e..e92468811ccf8b80ca3338eb7fffad7c9bb22b9c 100644 (file)
--- a/libmemcached/key.cc
+++ b/libmemcached/key.cc
@@ -37,16 +37,33 @@
 
 #include <libmemcached/common.h>
 
-memcached_return_t memcached_key_test(const memcached_st &memc,
+memcached_return_t memcached_key_test(memcached_st &memc,
                                       const char * const *keys,
                                       const size_t *key_length,
                                       size_t number_of_keys)
 {
-  if (not memc.flags.verify_key)
-    return MEMCACHED_SUCCESS;
+  if (keys == NULL or key_length == NULL)
+  {
+    return memcached_set_error(memc, MEMCACHED_BAD_KEY_PROVIDED, MEMCACHED_AT);
+  }
+
+  // If we don't need to verify the key, or we are using the binary protoocol,
+  // we just check the size of the key
+  if (memc.flags.verify_key == false or memc.flags.binary_protocol == true)
+  {
+    for (uint32_t x= 0; x < number_of_keys; x++)
+    {
+      // We should set binary key, but the memcached server is broken for
+      // longer keys at the moment.
+      memcached_return_t rc= memcached_validate_key_length(*(key_length +x), false /* memc.flags.binary_protocol */);
+      if (memcached_failed(rc))
+      {
+        return rc;
+      }
+    }
 
-  if (memc.flags.binary_protocol)
     return MEMCACHED_SUCCESS;
+  }
 
   for (uint32_t x= 0; x < number_of_keys; x++)
   {