From 272ffde5fd710e85607c0033ad80792d415f26b7 Mon Sep 17 00:00:00 2001 From: Trond Norbye Date: Thu, 11 Dec 2008 19:25:12 +0100 Subject: [PATCH] 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. --- libmemcached/memcached_connect.c | 2 ++ 1 file changed, 2 insertions(+) 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; -- 2.30.2