Incomming fixes from Charles on the replication branch.

[awesomized/libmemcached] / lib / memcached_storage.c

diff --git a/lib/memcached_storage.c b/lib/memcached_storage.c
index 2a0f88d493f355df2e862af79dfd1c8d8b2b22af..959f0b644fb254175d3ebbb4e3a55c4d4e43dc40 100644 (file)
--- a/lib/memcached_storage.c
+++ b/lib/memcached_storage.c
@@ -91,6 +91,8 @@ static inline memcached_return memcached_send(memcached_st *ptr,
 
   do
   {
+    char response_buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
+
     rc[replicas]=  memcached_do(&ptr->hosts[server_key], buffer, write_length, 0);
 
     if (rc[replicas] != MEMCACHED_SUCCESS)
@@ -111,11 +113,12 @@ static inline memcached_return memcached_send(memcached_st *ptr,
     if (to_write == 0)
       return MEMCACHED_BUFFERED;
     else
-      rc[replicas]= memcached_response(&ptr->hosts[server_key], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
+      rc[replicas]= memcached_response(&ptr->hosts[server_key],
+                                       response_buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
 
     /* On error we just jump to the next potential server */
 error:
-    if (replicas > 1 && ptr->distribution == MEMCACHED_DISTRIBUTION_CONSISTENT)
+    if (ptr->number_of_replicas > 1)
     {
       if (server_key == (ptr->number_of_hosts - 1))
         server_key= 0;