projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix dangling endif
[m6w6/libmemcached]
/
libmemcached
/
memcached_connect.c
diff --git
a/libmemcached/memcached_connect.c
b/libmemcached/memcached_connect.c
index d58b354f38b21ca9221a78570758bc041535c726..54316c59f90e677eae6752a7bedc45b318adfca0 100644
(file)
--- a/
libmemcached/memcached_connect.c
+++ b/
libmemcached/memcached_connect.c
@@
-13,7
+13,7
@@
static memcached_return set_hostinfo(memcached_server_st *server)
memset(&hints, 0, sizeof(hints));
memset(&hints, 0, sizeof(hints));
- hints.ai_family= AF_INET;
+
//
hints.ai_family= AF_INET;
if (server->type == MEMCACHED_CONNECTION_UDP)
{
hints.ai_protocol= IPPROTO_UDP;
if (server->type == MEMCACHED_CONNECTION_UDP)
{
hints.ai_protocol= IPPROTO_UDP;
@@
-34,7
+34,10
@@
static memcached_return set_hostinfo(memcached_server_st *server)
}
if (server->address_info)
}
if (server->address_info)
+ {
freeaddrinfo(server->address_info);
freeaddrinfo(server->address_info);
+ server->address_info= NULL;
+ }
server->address_info= ai;
return MEMCACHED_SUCCESS;
server->address_info= ai;
return MEMCACHED_SUCCESS;
@@
-177,6
+180,7
@@
static memcached_return network_connect(memcached_server_st *ptr)
if (ptr->server_failure_counter >= ptr->root->server_failure_limit)
{
memcached_server_remove(ptr);
if (ptr->server_failure_counter >= ptr->root->server_failure_limit)
{
memcached_server_remove(ptr);
+ return MEMCACHED_FAILURE;
}
}
/* Old connection junk still is in the structure */
}
}
/* Old connection junk still is in the structure */