Changed behavior for MEMCACHED_BEHAVIOR_NO_BLOCK to no longer also enable MEMCACHED_...

diff --git a/ChangeLog b/ChangeLog
index 223ae66e6af8c6817aa67ea8abe9f8b63e68da79..8386d7b308db950e91e74be984a5c6368f66c9ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+  * MEMCACHED_BEHAVIOR_NO_BLOCK no longer also sets MEMCACHED_BEHAVIOR_BUFFER_REQUESTS
+
 0.28 Tue Apr 14 18:56:28 PDT 2009
   * Fixed bug in init sructure (reapplied)
   * Fixed bug in get/set by key (nikkhils@gmail.com)

diff --git a/docs/memcached_behavior.pod b/docs/memcached_behavior.pod
index bce0b9e84c92d395df01cf465b12902ed5e40bd0..ccccfde220620380c37fb1b9e26a80b3c9018e15 100755 (executable)
--- a/docs/memcached_behavior.pod
+++ b/docs/memcached_behavior.pod
@@ -60,9 +60,7 @@ as will attempting to add a UDP server when this behavior has not been enabled.
 =item MEMCACHED_BEHAVIOR_NO_BLOCK
 
 Causes libmemcached(3) to use asychronous IO. This is the fastest transport
-available for storage functions. For read operations it is currently 
-similar in performance to the non-blocking method (this is being
-looked into).
+available for storage functions.
 
 =item MEMCACHED_BEHAVIOR_SND_TIMEOUT
 

diff --git a/libmemcached/memcached_behavior.c b/libmemcached/memcached_behavior.c
index e8f65ddf6eb3a23d45c20feb47045600dff1d5d4..eb28a37362caad19fe3defece57e616eb301dbe1 100644 (file)
--- a/libmemcached/memcached_behavior.c
+++ b/libmemcached/memcached_behavior.c
@@ -50,6 +50,7 @@ memcached_return memcached_behavior_set(memcached_st *ptr,
   case MEMCACHED_BEHAVIOR_NO_BLOCK:
     set_behavior_flag(ptr, MEM_NO_BLOCK, data);
     memcached_quit(ptr);
+    break;
   case MEMCACHED_BEHAVIOR_BUFFER_REQUESTS:
     set_behavior_flag(ptr, MEM_BUFFER_REQUESTS, data);
     memcached_quit(ptr);