X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fversion.c;h=54545cb9d46ff59112b4b30a028a4fb5877d0766;hb=4c23dcdab4f9c9941eb245bda2ff65371fca13d7;hp=ba0b243ed9bdf746281e06066a54fc20b5a54b37;hpb=26c65ac524f21cd73a79f3caf45cdb76c9a41bc0;p=m6w6%2Flibmemcached

diff --git a/libmemcached/version.c b/libmemcached/version.c
index ba0b243e..54545cb9 100644
--- a/libmemcached/version.c
+++ b/libmemcached/version.c
@@ -13,10 +13,19 @@ memcached_return_t memcached_version(memcached_st *ptr)
   if (ptr->flags.use_udp)
     return MEMCACHED_NOT_SUPPORTED;
 
+  bool was_blocking= ptr->flags.no_block;
+  memcached_return_t rc;
+
+  ptr->flags.no_block= false;
+
   if (ptr->flags.binary_protocol)
-    return memcached_version_binary(ptr);
+    rc= memcached_version_binary(ptr);
   else
-    return memcached_version_textual(ptr);      
+    rc= memcached_version_textual(ptr);      
+
+  ptr->flags.no_block= was_blocking;
+
+  return rc;
 }
 
 static inline memcached_return_t memcached_version_textual(memcached_st *ptr)