projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Setup for version .28 and fix for RPM build for Fedora 10
[m6w6/libmemcached]
/
libmemcached
/
memcached_connect.c
diff --git
a/libmemcached/memcached_connect.c
b/libmemcached/memcached_connect.c
index f066c52661d25a585585d60fa5496aad08cc2cf9..8e0e4208e864f11556ed8aaa9927aa8b15400c11 100644
(file)
--- a/
libmemcached/memcached_connect.c
+++ b/
libmemcached/memcached_connect.c
@@
-159,7
+159,8
@@
test_connect:
(struct sockaddr *)&servAddr,
sizeof(servAddr)) < 0)
{
(struct sockaddr *)&servAddr,
sizeof(servAddr)) < 0)
{
- switch (errno) {
+ switch (errno)
+ {
case EINPROGRESS:
case EALREADY:
case EINTR:
case EINPROGRESS:
case EALREADY:
case EINTR:
@@
-193,7
+194,7
@@
static memcached_return network_connect(memcached_server_st *ptr)
}
}
}
}
- if (
ptr->sockaddr_inited ||
+ if (
!ptr->sockaddr_inited ||
(!(ptr->root->flags & MEM_USE_CACHE_LOOKUPS)))
{
memcached_return rc;
(!(ptr->root->flags & MEM_USE_CACHE_LOOKUPS)))
{
memcached_return rc;
@@
-209,7
+210,8
@@
static memcached_return network_connect(memcached_server_st *ptr)
while (use != NULL)
{
/* Memcache server does not support IPV6 in udp mode, so skip if not ipv4 */
while (use != NULL)
{
/* Memcache server does not support IPV6 in udp mode, so skip if not ipv4 */
- if (ptr->type == MEMCACHED_CONNECTION_UDP && use->ai_family != AF_INET) {
+ if (ptr->type == MEMCACHED_CONNECTION_UDP && use->ai_family != AF_INET)
+ {
use= use->ai_next;
continue;
}
use= use->ai_next;
continue;
}