Merge in code changes for all of the new parser.

[m6w6/libmemcached] / libmemcached / version.c

diff --git a/libmemcached/version.c b/libmemcached/version.c
index 8fcc11a0fb6b95b2ed95eedd17a9a69735f768f3..82de87d362240666b2134ee50b802c56b7e99952 100644 (file)
--- a/libmemcached/version.c
+++ b/libmemcached/version.c
@@ -13,18 +13,13 @@ 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)
     rc= memcached_version_binary(ptr);
   else
     rc= memcached_version_textual(ptr);      
 
-  ptr->flags.no_block= was_blocking;
-
   return rc;
 }
 
@@ -36,7 +31,7 @@ static inline memcached_return_t memcached_version_textual(memcached_st *ptr)
   char *response_ptr;
   const char *command= "version\r\n";
 
-  send_length= strlen(command);
+  send_length= sizeof("version\r\n") -1;
 
   rc= MEMCACHED_SUCCESS;
   for (uint32_t x= 0; x < memcached_server_count(ptr); x++)