projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Few more cleanups.
[m6w6/libmemcached]
/
libmemcached
/
memcached_connect.c
diff --git
a/libmemcached/memcached_connect.c
b/libmemcached/memcached_connect.c
index 8c7ef3326332d10c442de800c24430a0e40e4a70..de69e4465ef8c68e34d608f4bace32d4d0cd5042 100644
(file)
--- a/
libmemcached/memcached_connect.c
+++ b/
libmemcached/memcached_connect.c
@@
-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;
@@
-172,9
+175,12
@@
static memcached_return network_connect(memcached_server_st *ptr)
{
struct addrinfo *use;
{
struct addrinfo *use;
- if(ptr->root->server_failure_limit != 0) {
- if(ptr->server_failure_counter >= ptr->root->server_failure_limit) {
+ if (ptr->root->server_failure_limit != 0)
+ {
+ if (ptr->server_failure_counter >= ptr->root->server_failure_limit)
+ {
memcached_server_remove(ptr);
memcached_server_remove(ptr);
+ return MEMCACHED_FAILURE;
}
}
/* Old connection junk still is in the structure */
}
}
/* Old connection junk still is in the structure */