X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_get.c;h=4894b2a05ef32334a9f26029057412ee5ac2dda7;hb=04ba254a9c8b8be2aec1794bece362bc819acffc;hp=8ea1fabc964c59888be79358d167304fc65f0fb0;hpb=d3ef73cd144dfdbcaff41d3373e4458fb351f7af;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_get.c b/lib/memcached_get.c
index 8ea1fabc..4894b2a0 100644
--- a/lib/memcached_get.c
+++ b/lib/memcached_get.c
@@ -96,6 +96,13 @@ static char *memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_len
 
       value_ptr= value;
       read_length= 0;
+      /* 
+        We read the \r\n into the string since not doing so is more 
+        cycles then the waster of memory to do so.
+
+        We are null terminating through, which will most likely make
+        some people lazy about using the return length.
+      */
       to_read= (*value_length) + 2;
 
       read_length= memcached_io_read(ptr, server_key,
@@ -107,6 +114,9 @@ static char *memcached_value_fetch(memcached_st *ptr, char *key, size_t *key_len
         goto read_error;
       }
 
+      value[*value_length]= 0;
+      value[(*value_length) + 1]= 0;
+
       return value;
     }
   }
@@ -130,14 +140,14 @@ char *memcached_get(memcached_st *ptr, char *key, size_t key_length,
   char *value;
   LIBMEMCACHED_MEMCACHED_GET_START();
 
+  server_key= memcached_generate_hash(ptr, key, key_length);
+
   *value_length= 0;
-  *error= memcached_connect(ptr);
+  *error= memcached_connect(ptr, server_key);
 
   if (*error != MEMCACHED_SUCCESS)
     goto error;
 
-  server_key= memcached_generate_hash(ptr, key, key_length);
-
   send_length= snprintf(buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, "get %.*s\r\n", 
                         (int)key_length, key);
 
@@ -195,11 +205,6 @@ memcached_return memcached_mget(memcached_st *ptr,
   ptr->cursor_server= 0;
   memset(buffer, 0, HUGE_STRING_LEN);
 
-  rc= memcached_connect(ptr);
-
-  if (rc != MEMCACHED_SUCCESS)
-    return rc;
-
   cursor_key_exec= (memcached_string_st **)malloc(sizeof(memcached_string_st *) * ptr->number_of_hosts);
   memset(cursor_key_exec, 0, sizeof(memcached_string_st *) * ptr->number_of_hosts);
 
@@ -240,6 +245,9 @@ memcached_return memcached_mget(memcached_st *ptr,
   {
     if (cursor_key_exec[x])
     {
+      /* We need to doo something about non-connnected hosts in the future */
+      rc= memcached_connect(ptr, x);
+
       memcached_string_st *string= cursor_key_exec[x];
       memcached_string_append(ptr, string, "\r\n", 2);