X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_behavior.c;h=5a992b42b8780e7d7c5ab9b9a32d7fe88f8cc7b2;hb=refs%2Ftags%2F0.26;hp=5f68844041dc4f33be96988c6a63f0c06d337731;hpb=2b312deb8b7b3f662b492f94a13e673723387724;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memcached_behavior.c b/libmemcached/memcached_behavior.c
index 5f688440..5a992b42 100644
--- a/libmemcached/memcached_behavior.c
+++ b/libmemcached/memcached_behavior.c
@@ -40,6 +40,8 @@ memcached_return memcached_behavior_set(memcached_st *ptr,
     ptr->server_failure_limit= (uint32_t)data;
     break;     
   case MEMCACHED_BEHAVIOR_BINARY_PROTOCOL:
+    if (data)
+        set_behavior_flag(ptr, MEM_VERIFY_KEY, 0);
     set_behavior_flag(ptr, MEM_BINARY_PROTOCOL, data);
     break;     
   case MEMCACHED_BEHAVIOR_SUPPORT_CAS:
@@ -101,6 +103,8 @@ memcached_return memcached_behavior_set(memcached_st *ptr,
     memcached_quit(ptr);
     break;
   case MEMCACHED_BEHAVIOR_VERIFY_KEY:
+    if (ptr->flags & MEM_BINARY_PROTOCOL)
+        break;
     set_behavior_flag(ptr, MEM_VERIFY_KEY, data);
     break;
   case MEMCACHED_BEHAVIOR_SORT_HOSTS:
@@ -132,6 +136,9 @@ memcached_return memcached_behavior_set(memcached_st *ptr,
   case MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY:
     set_behavior_flag(ptr, MEM_HASH_WITH_PREFIX_KEY, data);
     break;
+  case MEMCACHED_BEHAVIOR_NOREPLY:
+    set_behavior_flag(ptr, MEM_NOREPLY, data);
+    break;     
   }
 
   return MEMCACHED_SUCCESS;
@@ -240,6 +247,9 @@ uint64_t memcached_behavior_get(memcached_st *ptr,
   case MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY:
     temp_flag= MEM_HASH_WITH_PREFIX_KEY;
     break;
+  case MEMCACHED_BEHAVIOR_NOREPLY:
+    temp_flag= MEM_NOREPLY;
+    break;
   }
 
   WATCHPOINT_ASSERT(temp_flag); /* Programming mistake if it gets this far */
@@ -247,6 +257,4 @@ uint64_t memcached_behavior_get(memcached_st *ptr,
     return 1;
   else
     return 0;
-
-  return MEMCACHED_SUCCESS;
 }