projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Deprecate MEMCACHED_NO_KEY_PROVIDED, and fixed key validation tests for the binary...
[m6w6/libmemcached]
/
libmemcached
/
memcached_connect.c
diff --git
a/libmemcached/memcached_connect.c
b/libmemcached/memcached_connect.c
index 3ae0b611e2a809a480d2f7ee41ad1164d4b8aede..ca35420066582efcf7d62cc18e24845ca4921fa8 100644
(file)
--- a/
libmemcached/memcached_connect.c
+++ b/
libmemcached/memcached_connect.c
@@
-51,7
+51,7
@@
static memcached_return set_socket_options(memcached_server_st *ptr)
if (ptr->type == MEMCACHED_CONNECTION_UDP)
return MEMCACHED_SUCCESS;
if (ptr->type == MEMCACHED_CONNECTION_UDP)
return MEMCACHED_SUCCESS;
-#if
ndef __sun
+#if
def HAVE_SNDTIMEO
if (ptr->root->snd_timeout)
{
int error;
if (ptr->root->snd_timeout)
{
int error;
@@
-64,7
+64,9
@@
static memcached_return set_socket_options(memcached_server_st *ptr)
&waittime, (socklen_t)sizeof(struct timeval));
WATCHPOINT_ASSERT(error == 0);
}
&waittime, (socklen_t)sizeof(struct timeval));
WATCHPOINT_ASSERT(error == 0);
}
+#endif
+#ifdef HAVE_RCVTIMEO
if (ptr->root->rcv_timeout)
{
int error;
if (ptr->root->rcv_timeout)
{
int error;
@@
-191,7
+193,7
@@
static memcached_return network_connect(memcached_server_st *ptr)
}
}
}
}
- if (ptr->sockaddr_inited
== MEMCACHED_NOT_ALLOCATED
||
+ if (ptr->sockaddr_inited ||
(!(ptr->root->flags & MEM_USE_CACHE_LOOKUPS)))
{
memcached_return rc;
(!(ptr->root->flags & MEM_USE_CACHE_LOOKUPS)))
{
memcached_return rc;
@@
-199,7
+201,7
@@
static memcached_return network_connect(memcached_server_st *ptr)
rc= set_hostinfo(ptr);
if (rc != MEMCACHED_SUCCESS)
return rc;
rc= set_hostinfo(ptr);
if (rc != MEMCACHED_SUCCESS)
return rc;
- ptr->sockaddr_inited=
MEMCACHED_ALLOCATED
;
+ ptr->sockaddr_inited=
true
;
}
use= ptr->address_info;
}
use= ptr->address_info;