X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fio.c;h=167b3e6b0d7f521aac98f3070e7d53877a54cee9;hb=4a45f8f5e5bf5967694dac410cfae1ea53f64202;hp=17de85725d32c28c36c540644056d807111666e7;hpb=09355b181813d55d406f5346a4600811acd184fb;p=awesomized%2Flibmemcached

diff --git a/libmemcached/io.c b/libmemcached/io.c
index 17de8572..167b3e6b 100644
--- a/libmemcached/io.c
+++ b/libmemcached/io.c
@@ -55,14 +55,10 @@ static memcached_return_t io_wait(memcached_server_write_instance_st ptr,
       return MEMCACHED_FAILURE;
   }
 
-  int timeout= ptr->root->poll_timeout;
-  if (ptr->root->flags.no_block == false)
-    timeout= -1;
-
   size_t loop_max= 5;
   while (--loop_max) // While loop is for ERESTART or EINTR
   {
-    error= poll(&fds, 1, timeout);
+    error= poll(&fds, 1, ptr->root->poll_timeout);
 
     switch (error)
     {
@@ -412,7 +408,6 @@ static ssize_t _io_write(memcached_server_write_instance_st ptr,
       sent_length= io_flush(ptr, &rc);
       if (sent_length == -1)
       {
-        fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
         return -1;
       }
 
@@ -659,10 +654,11 @@ static ssize_t io_flush(memcached_server_write_instance_st ptr,
           fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
           return -1;
         }
+      case ENOTCONN:
       default:
+        fprintf(stderr, "%s:%d (%s)(%s)\n", __FILE__, __LINE__,__func__, strerror(errno));fflush(stdout);
         memcached_quit_server(ptr, true);
         *error= MEMCACHED_ERRNO;
-        fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
         return -1;
       }
     }