Committing work for next release (got to do something over lunch aye?)

[awesomized/libmemcached] / lib / memcached_fetch.c

diff --git a/lib/memcached_fetch.c b/lib/memcached_fetch.c
index b8954748735e1cd99d2cc6a4fccff382ad4fb904..8d281f35d182dd0758df03425cad4c7b24cdea0d 100644 (file)
--- a/lib/memcached_fetch.c
+++ b/lib/memcached_fetch.c
@@ -147,6 +147,9 @@ char *memcached_fetch(memcached_st *ptr, char *key, size_t *key_length,
   memcached_string_st *result_buffer;
   result_buffer= &ptr->result_buffer;
 
+  if (ptr->flags & MEM_NO_BLOCK)
+    memcached_io_preread(ptr);
+
   while (ptr->cursor_server < ptr->number_of_hosts)
   {
     if (!ptr->hosts[ptr->cursor_server].cursor_active)
@@ -185,6 +188,9 @@ memcached_result_st *memcached_fetch_result(memcached_st *ptr,
 
   WATCHPOINT_ASSERT(result->value.is_allocated != MEMCACHED_USED);
 
+  if (ptr->flags & MEM_NO_BLOCK)
+    memcached_io_preread(ptr);
+
   while (ptr->cursor_server < ptr->number_of_hosts)
   {
     if (!ptr->hosts[ptr->cursor_server].cursor_active)