projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge
[awesomized/libmemcached]
/
lib
/
memcached_auto.c
diff --git
a/lib/memcached_auto.c
b/lib/memcached_auto.c
index f21f8f2f260aa4bccc436c129d2c5633d58e7019..36780dc5409f3dee8dc5151cf1c8dc1ed96cd06a 100644
(file)
--- a/
lib/memcached_auto.c
+++ b/
lib/memcached_auto.c
@@
-17,6
+17,9
@@
static memcached_return memcached_auto(memcached_st *ptr,
if (ptr->hosts == NULL || ptr->number_of_hosts == 0)
return MEMCACHED_NO_SERVERS;
if (ptr->hosts == NULL || ptr->number_of_hosts == 0)
return MEMCACHED_NO_SERVERS;
+ if (key_test(&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED)
+ return MEMCACHED_BAD_KEY_PROVIDED;
+
server_key= memcached_generate_hash(ptr, key, key_length);
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
server_key= memcached_generate_hash(ptr, key, key_length);
send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE,
@@
-35,16
+38,16
@@
static memcached_return memcached_auto(memcached_st *ptr,
/*
So why recheck responce? Because the protocol is brain dead :)
The number returned might end up equaling one of the string
/*
So why recheck responce? Because the protocol is brain dead :)
The number returned might end up equaling one of the string
- values. Less chance of a mistake with
mem
cmp() so we will
+ values. Less chance of a mistake with
strn
cmp() so we will
use it. We still called memcached_response() though since it
worked its magic for non-blocking IO.
*/
use it. We still called memcached_response() though since it
worked its magic for non-blocking IO.
*/
- if (!
memcmp(buffer, "ERROR\r\n", MEMCACHED_DEFAULT_COMMAND_SIZE
))
+ if (!
strncmp(buffer, "ERROR\r\n", 7
))
{
*value= 0;
rc= MEMCACHED_PROTOCOL_ERROR;
}
{
*value= 0;
rc= MEMCACHED_PROTOCOL_ERROR;
}
- else if (!
memcmp(buffer, "NOT_FOUND\r\n", MEMCACHED_DEFAULT_COMMAND_SIZE
))
+ else if (!
strncmp(buffer, "NOT_FOUND\r\n", 11
))
{
*value= 0;
rc= MEMCACHED_NOTFOUND;
{
*value= 0;
rc= MEMCACHED_NOTFOUND;