From: Michael Wallner <mike@php.net>
Date: Tue, 21 Jan 2020 13:57:42 +0000 (+0100)
Subject: libmemcached: sasl (fix #14 and #17)
X-Git-Tag: pre_cmake~26
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=383ce14b17a4c3745025bba5dac0a40b5cfded15;p=m6w6%2Flibmemcached

libmemcached: sasl (fix #14 and #17)

MEMCACHED_AUTH_CONTINUE was considered a failure condition which led to
IO reset
---

diff --git a/libmemcached-1.0/return.h b/libmemcached-1.0/return.h
index 781603b8..e2b4104c 100644
--- a/libmemcached-1.0/return.h
+++ b/libmemcached-1.0/return.h
@@ -50,18 +50,20 @@ static inline bool memcached_success(memcached_return_t rc)
 
 static inline bool memcached_failed(memcached_return_t rc)
 {
-  return (rc != MEMCACHED_SUCCESS && 
+  return (rc != MEMCACHED_AUTH_CONTINUE &&
+          rc != MEMCACHED_BUFFERED &&
+          rc != MEMCACHED_DELETED &&
           rc != MEMCACHED_END && 
+          rc != MEMCACHED_ITEM &&
+          rc != MEMCACHED_STAT &&
           rc != MEMCACHED_STORED && 
-          rc != MEMCACHED_STAT && 
-          rc != MEMCACHED_DELETED &&
-          rc != MEMCACHED_BUFFERED &&
+          rc != MEMCACHED_SUCCESS &&
           rc != MEMCACHED_VALUE);
 }
 
 static inline bool memcached_fatal(memcached_return_t rc)
 {
-  return (
+  return (rc != MEMCACHED_AUTH_CONTINUE &&
           rc != MEMCACHED_BUFFERED &&
           rc != MEMCACHED_CLIENT_ERROR &&
           rc != MEMCACHED_DATA_EXISTS &&