From: Trond Norbye <trond.norbye@sun.com>
Date: Thu, 11 Dec 2008 18:25:12 +0000 (+0100)
Subject: Disable SO_SNDTIMEO and SO_RCVTIMEO on Solaris
X-Git-Tag: 0.26~33
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=272ffde5fd710e85607c0033ad80792d415f26b7;p=m6w6%2Flibmemcached

Disable SO_SNDTIMEO and SO_RCVTIMEO on Solaris

setsockopt(SO_SNDTIMEO/SO_RCVTIMEO) returns -1 with errno == 99 (not supported)
I have temporarily disabled the code with #ifdef __sun, but should update
the configure script to test for this and set the correct macros.
---

diff --git a/libmemcached/memcached_connect.c b/libmemcached/memcached_connect.c
index 12f4affd..3ae0b611 100644
--- a/libmemcached/memcached_connect.c
+++ b/libmemcached/memcached_connect.c
@@ -51,6 +51,7 @@ static memcached_return set_socket_options(memcached_server_st *ptr)
   if (ptr->type == MEMCACHED_CONNECTION_UDP)
     return MEMCACHED_SUCCESS;
 
+#ifndef __sun
   if (ptr->root->snd_timeout)
   {
     int error;
@@ -76,6 +77,7 @@ static memcached_return set_socket_options(memcached_server_st *ptr)
                       &waittime, (socklen_t)sizeof(struct timeval));
     WATCHPOINT_ASSERT(error == 0);
   }
+#endif
 
   {
     int error;