projects
/
m6w6
/
libmemcached
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
| inline |
side by side
(parent:
295e847
)
Disable SO_SNDTIMEO and SO_RCVTIMEO on Solaris
author
Trond Norbye
<trond.norbye@sun.com>
Thu, 11 Dec 2008 18:25:12 +0000
(19:25 +0100)
committer
Trond Norbye
<trond.norbye@sun.com>
Thu, 11 Dec 2008 18:25:12 +0000
(19:25 +0100)
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
patch
|
blob
|
history
diff --git
a/libmemcached/memcached_connect.c
b/libmemcached/memcached_connect.c
index 12f4affd9ed6f31469689a23c8f55780a193ed82..3ae0b611e2a809a480d2f7ee41ad1164d4b8aede 100644
(file)
--- 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;