Changeset 19507

Timestamp:

09/18/08 20:01:44 (5 years ago)

Author:

mattn

Message:

check connect timeout.

Files:

• lang/c/libmemcached-win32/libmemcached-0.23/libmemcached/memcached_connect.c (modified) (3 diffs)

lang/c/libmemcached-win32/libmemcached-0.23/libmemcached/memcached_connect.c

@@ -283 +283 @@
             tv.tv_sec = 0;
             tv.tv_usec = ptr->root->connect_timeout;
-            error = select(0, &fds, NULL, NULL, &tv);
+            error = select(ptr->fd + 1, NULL, &fds, NULL, &tv);
 
             if (error == 0) 
@@ -302 +302 @@
               }
 
-          if (ptr->root->retry_timeout)
-          {
-            struct timeval next_time;
-
-            gettimeofday(&next_time, NULL);
-            ptr->next_retry= next_time.tv_sec + ptr->root->retry_timeout;
-          }
+              if (ptr->root->retry_timeout)
+              {
+                struct timeval next_time;
+
+                gettimeofday(&next_time, NULL);
+                ptr->next_retry= next_time.tv_sec + ptr->root->retry_timeout;
+              }
               ptr->server_failure_counter+= 1;
               return MEMCACHED_ERRNO;
@@ -324 +324 @@
 handle_retry:
           ptr->cached_errno= errno;
+#ifndef _WIN32
           close(ptr->fd);
+#else
+          closesocket(ptr->fd);
+#endif
           ptr->fd= -1;
           if (ptr->root->retry_timeout)