Removed recent regression issue with close()

[awesomized/libmemcached] / lib / memcached_connect.c

diff --git a/lib/memcached_connect.c b/lib/memcached_connect.c
index 82a08ab7327ea513908d4fac32066e8d8743952f..f4c80d5cc53d97e612f318a8694b825c2b7d6957 100644 (file)
--- a/lib/memcached_connect.c
+++ b/lib/memcached_connect.c
@@ -143,7 +143,13 @@ static memcached_return tcp_connect(memcached_st *ptr, unsigned int server_key)
 
       flags= fcntl(ptr->hosts[server_key].fd, F_GETFL, 0);
       if (flags != -1)
+      {
         (void)fcntl(ptr->hosts[server_key].fd, F_SETFL, flags | O_NONBLOCK);
+
+        flags= 1;
+        setsockopt(ptr->hosts[server_key].fd, IPPROTO_TCP, SO_LINGER, 
+                   &flags, (socklen_t)sizeof(int));
+      }
     }
 
     if (ptr->flags & MEM_TCP_NODELAY)