From af1f90c44906eb831ff632eba268236d1377058f Mon Sep 17 00:00:00 2001 From: Brian Aker Date: Fri, 14 Dec 2007 02:15:03 -0800 Subject: [PATCH] Fix for lingers socket issues on Freebsd --- lib/memcached_connect.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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) -- 2.30.2