X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fmemcached_auto.c;h=36780dc5409f3dee8dc5151cf1c8dc1ed96cd06a;hb=e660fe3e93b1068891c1306fd9eaeac27d3c18a9;hp=aa8cde3295dd953399da706a37ab426219e15f4a;hpb=b1d5d8be2237f04ccc99939399ebe7efad3f684e;p=awesomized%2Flibmemcached

diff --git a/lib/memcached_auto.c b/lib/memcached_auto.c
index aa8cde32..36780dc5 100644
--- 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 (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, 
@@ -26,25 +29,25 @@ static memcached_return memcached_auto(memcached_st *ptr,
   if (send_length >= MEMCACHED_DEFAULT_COMMAND_SIZE)
     return MEMCACHED_WRITE_FAILURE;
 
-  rc= memcached_do(ptr, server_key, buffer, send_length, 1);
+  rc= memcached_do(&ptr->hosts[server_key], buffer, send_length, 1);
   if (rc != MEMCACHED_SUCCESS)
     return rc;
 
-  rc= memcached_response(ptr, buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL, server_key);
+  rc= memcached_response(&ptr->hosts[server_key], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
 
   /* 
     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 memcmp() so we will 
+    values. Less chance of a mistake with strncmp() so we will 
     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;
   }
-  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;