projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Change binary protocol behavior to disallow the use of key verification. (We disable...
[m6w6/libmemcached]
/
libmemcached
/
memcached_behavior.c
diff --git
a/libmemcached/memcached_behavior.c
b/libmemcached/memcached_behavior.c
index 5f68844041dc4f33be96988c6a63f0c06d337731..fc785e25c58562bcae365e0ac02d7631f08fe8fe 100644
(file)
--- 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:
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:
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:
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:
set_behavior_flag(ptr, MEM_VERIFY_KEY, data);
break;
case MEMCACHED_BEHAVIOR_SORT_HOSTS: