revert most of d7a0084bf99d618d1dc26a54fd413db7ae8b8e63

[awesomized/libmemcached] / src / libmemcached / response.cc

diff --git a/src/libmemcached/response.cc b/src/libmemcached/response.cc
index 5f0f020442a295e8305976e7788093b057728548..d39451332633946641585a0311d132d39891657b 100644 (file)
--- a/src/libmemcached/response.cc
+++ b/src/libmemcached/response.cc
@@ -1,6 +1,6 @@
 /*
     +--------------------------------------------------------------------+
-    | libmemcached - C/C++ Client Library for memcached                  |
+    | libmemcached-awesome - C/C++ Client Library for memcached          |
     +--------------------------------------------------------------------+
     | Redistribution and use in source and binary forms, with or without |
     | modification, are permitted under the terms of the BSD license.    |
@@ -9,7 +9,7 @@
     | the terms online at: https://opensource.org/licenses/BSD-3-Clause  |
     +--------------------------------------------------------------------+
     | Copyright (c) 2006-2014 Brian Aker   https://datadifferential.com/ |
-    | Copyright (c) 2020 Michael Wallner   <mike@php.net>                |
+    | Copyright (c) 2020-2021 Michael Wallner        https://awesome.co/ |
     +--------------------------------------------------------------------+
 */
 
@@ -197,7 +197,7 @@ static memcached_return_t textual_read_one_response(memcached_instance_st *insta
              and buffer[5] == 'O' and buffer[6] == 'N') /* VERSION */
     {
       /* Find the space, and then move one past it to copy version */
-      char *response_ptr = index(buffer, ' ');
+      char *response_ptr = strchr(buffer, ' ');
 
       char *endptr;
       errno = 0;
@@ -761,7 +761,7 @@ static memcached_return_t _read_one_response(memcached_instance_st *instance, ch
     rc = textual_read_one_response(instance, buffer, buffer_length, result);
   }
 
-  if (memcached_fatal(rc) && rc != MEMCACHED_TIMEOUT) {
+  if (memcached_fatal(rc)) {
     memcached_io_reset(instance);
   }