Add support for AUTO_EJECT_HOST

[awesomized/libmemcached] / libmemcached / memcached_io.c

diff --git a/libmemcached/memcached_io.c b/libmemcached/memcached_io.c
index 43fb509e64c18f44f8dd6352d78e21511b8fc2be..3f184e068624fbbde7c876dd5554a96f61860855 100644 (file)
--- a/libmemcached/memcached_io.c
+++ b/libmemcached/memcached_io.c
@@ -116,16 +116,11 @@ ssize_t memcached_io_read(memcached_server_st *ptr,
           switch (errno)
           {
           case EAGAIN:
-          case EINTR: 
-            {
-              memcached_return rc;
-
-              rc= io_wait(ptr, MEM_READ);
+          case EINTR:
+            if (io_wait(ptr, MEM_READ) == MEMCACHED_SUCCESS)
+              continue;
+          /* fall through */
 
-              if (rc == MEMCACHED_SUCCESS)
-                continue;
-            }
-          /* fall trough */
           default:
             {
               memcached_quit_server(ptr, 1);
@@ -177,6 +172,7 @@ ssize_t memcached_io_read(memcached_server_st *ptr,
     }
   }
 
+  ptr->server_failure_counter= 0;
   return (size_t)(buffer_ptr - (char*)buffer);
 }