From: Michael Wallner <mike@php.net>
Date: Tue, 14 Jan 2020 14:35:57 +0000 (+0100)
Subject: libmemcachedutil: fix version check
X-Git-Tag: pre_cmake~40
X-Git-Url: https://git.m6w6.name/?p=awesomized%2Flibmemcached;a=commitdiff_plain;h=f00605dce4a482c8b19ef17c0e79c31238498522

libmemcachedutil: fix version check
---

diff --git a/libmemcachedutil/version.cc b/libmemcachedutil/version.cc
index 0fcfb5c5..75a8f60e 100644
--- a/libmemcachedutil/version.cc
+++ b/libmemcachedutil/version.cc
@@ -55,12 +55,20 @@ static memcached_return_t check_server_version(const memcached_st *,
   /* Do Nothing */
   struct local_context *check= (struct local_context *)context;
 
-  if (memcached_server_major_version(instance) != UINT8_MAX &&
-      memcached_server_major_version(instance) >= check->major_version and
-      memcached_server_minor_version(instance) >= check->minor_version and
-      memcached_server_micro_version(instance) >= check->micro_version )
-  {
-    return MEMCACHED_SUCCESS;
+  if (memcached_server_major_version(instance) != UINT8_MAX) {
+    uint32_t sv, cv;
+
+    sv = memcached_server_micro_version(instance)
+        |memcached_server_minor_version(instance) << 8
+        |memcached_server_major_version(instance) << 16
+        ;
+    cv = check->micro_version
+        |check->minor_version << 8
+        |check->major_version << 16;
+
+    if (sv >= cv) {
+      return MEMCACHED_SUCCESS;
+    }
   }
 
   check->truth= false;