X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_storage.c;h=9d82b56f8659244c7dfc2c16072f18a39e5b95ce;hb=375ad7d822a4bbc121a79ce7e927385d6be7f754;hp=6bbb387ff0782119a476e401fb60b3f9c0b32775;hpb=8662a68fe1c094b660d04142798be0cac07f985d;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_storage.c b/lib/memcached_storage.c
index 6bbb387f..9d82b56f 100644
--- a/lib/memcached_storage.c
+++ b/lib/memcached_storage.c
@@ -26,6 +26,7 @@ static memcached_return memcached_send(memcached_st *ptr,
                                        uint16_t  flags,
                                        memcached_storage_action verb)
 {
+  char to_write;
   size_t write_length;
   ssize_t sent_length;
   memcached_return rc;
@@ -35,16 +36,12 @@ static memcached_return memcached_send(memcached_st *ptr,
   assert(value);
   assert(value_length);
 
-  memset(buffer, 0, MEMCACHED_DEFAULT_COMMAND_SIZE);
-
   /* Leaving this assert in since only a library fubar could blow this */
-  if (ptr->write_buffer_offset != 0)
-  {
-    WATCHPOINT_NUMBER(ptr->write_buffer_offset);
-  }
+#ifdef NOT_DONE
+  if (!(ptr->flags & MEM_NO_BLOCK) && ptr->write_buffer_offset != 0)
+    assert(0);
+#endif
     
-  assert(ptr->write_buffer_offset == 0);
-
   server_key= memcached_generate_hash(ptr, key, key_length);
 
   rc= memcached_connect(ptr, server_key);
@@ -77,7 +74,12 @@ static memcached_return memcached_send(memcached_st *ptr,
     goto error;
   }
 
-  if ((sent_length= memcached_io_write(ptr, server_key, "\r\n", 2, 1)) == -1)
+  if ((ptr->flags & MEM_NO_BLOCK) && verb == SET_OP)
+    to_write= 0;
+  else
+    to_write= 1;
+
+  if ((sent_length= memcached_io_write(ptr, server_key, "\r\n", 2, to_write)) == -1)
   {
     memcached_quit_server(ptr, server_key);
     rc= MEMCACHED_WRITE_FAILURE;