From: Brian Aker <brian@tangent.org>
Date: Fri, 14 Dec 2007 10:15:03 +0000 (-0800)
Subject: Fix for lingers socket issues on Freebsd
X-Git-Tag: 0.13~29
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;ds=sidebyside;h=af1f90c44906eb831ff632eba268236d1377058f;p=m6w6%2Flibmemcached

Fix for lingers socket issues on Freebsd
---

diff --git a/lib/memcached_connect.c b/lib/memcached_connect.c
index f5acadfa..98d7630f 100644
--- a/lib/memcached_connect.c
+++ b/lib/memcached_connect.c
@@ -140,12 +140,24 @@ static memcached_return tcp_connect(memcached_st *ptr, unsigned int server_key)
     {
       int error;
       struct linger linger;
+      struct timeval waittime;
+
+      waittime.tv_sec= 10;
+      waittime.tv_usec= 0;
 
       linger.l_onoff= 1; 
       linger.l_linger= MEMCACHED_DEFAULT_TIMEOUT; 
       error= setsockopt(ptr->hosts[server_key].fd, SOL_SOCKET, SO_LINGER, 
                         &linger, (socklen_t)sizeof(struct linger));
       WATCHPOINT_ASSERT(error == 0);
+
+      error= setsockopt(ptr->hosts[server_key].fd, SOL_SOCKET, SO_SNDTIMEO, 
+                        &waittime, (socklen_t)sizeof(struct timeval));
+      WATCHPOINT_ASSERT(error == 0);
+
+      error= setsockopt(ptr->hosts[server_key].fd, SOL_SOCKET, SO_RCVTIMEO, 
+                        &waittime, (socklen_t)sizeof(struct timeval));
+      WATCHPOINT_ASSERT(error == 0);
     }
 
     if (ptr->flags & MEM_TCP_NODELAY)