X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=inline;f=libmemcached%2Fversion.cc;h=9f41c97ae6ac10e7224cb576d81027dc21615fd7;hb=b5495838fb245aa1068a1198ed549b98a9c3e666;hp=7fc85fd432fd7a6ebb636105f0b8f591d9131b3a;hpb=1bcc4d8c163e2b696d6ce313a6cba423e81173f9;p=m6w6%2Flibmemcached

diff --git a/libmemcached/version.cc b/libmemcached/version.cc
index 7fc85fd4..9f41c97a 100644
--- a/libmemcached/version.cc
+++ b/libmemcached/version.cc
@@ -48,6 +48,7 @@ static inline memcached_return_t memcached_version_textual(memcached_st *ptr)
     { memcached_literal_param("version\r\n") },
   };
 
+  uint32_t success= 0;
   bool errors_happened= false;
   for (uint32_t x= 0; x < memcached_server_count(ptr); x++)
   {
@@ -64,13 +65,23 @@ static inline memcached_return_t memcached_version_textual(memcached_st *ptr)
     {
       errors_happened= true;
       (void)memcached_set_error(*instance, rrc, MEMCACHED_AT);
-      instance->major_version= instance->minor_version= instance->micro_version= UINT8_MAX;
+      continue;
     }
-    else if (memcached_failed(rrc= memcached_response(instance, NULL)))
+    success++;
+  }
+
+  if (success)
+  {
+    // Collect the returned items
+    memcached_server_write_instance_st instance;
+    while ((instance= memcached_io_get_readable_server(ptr)))
     {
-      errors_happened= true;
-      memcached_set_error(*instance, rrc, MEMCACHED_AT);
-      instance->major_version= instance->minor_version= instance->micro_version= UINT8_MAX;
+      memcached_return_t rrc= memcached_response(instance, NULL);
+      if (memcached_failed(rrc))
+      {
+        memcached_io_reset(instance);
+        errors_happened= true;
+      }
     }
   }
 
@@ -80,7 +91,7 @@ static inline memcached_return_t memcached_version_textual(memcached_st *ptr)
 static inline memcached_return_t memcached_version_binary(memcached_st *ptr)
 {
   protocol_binary_request_version request= {};
-  request.message.header.request.magic= PROTOCOL_BINARY_REQ;
+
   request.message.header.request.opcode= PROTOCOL_BINARY_CMD_VERSION;
   request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
 
@@ -95,6 +106,8 @@ static inline memcached_return_t memcached_version_binary(memcached_st *ptr)
   {
     memcached_server_write_instance_st instance= memcached_server_instance_fetch(ptr, x);
 
+    initialize_binary_request(instance, request.message.header);
+
     if (instance->major_version != UINT8_MAX)
     {
       continue;