projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Incomming fix from Chris
[m6w6/libmemcached]
/
libmemcached
/
memcached_server.c
diff --git
a/libmemcached/memcached_server.c
b/libmemcached/memcached_server.c
index 6dff69408571b4c0f459b60241621878709b584c..c836cfa297f9de48b241d5f1e5d91a7f763e1d64 100644
(file)
--- a/
libmemcached/memcached_server.c
+++ b/
libmemcached/memcached_server.c
@@
-27,6
+27,17
@@
memcached_server_st *memcached_server_create(memcached_st *memc, memcached_serve
void memcached_server_free(memcached_server_st *ptr)
{
void memcached_server_free(memcached_server_st *ptr)
{
+ memcached_return rc;
+ WATCHPOINT_ASSERT(ptr->is_allocated != MEMCACHED_NOT_ALLOCATED);
+
+ memcached_quit_server(ptr, 0);
+
+ if (ptr->address_info)
+ {
+ freeaddrinfo(ptr->address_info);
+ ptr->address_info= NULL;
+ }
+
if (ptr->is_allocated == MEMCACHED_ALLOCATED)
{
if (ptr->root && ptr->root->call_free)
if (ptr->is_allocated == MEMCACHED_ALLOCATED)
{
if (ptr->root && ptr->root->call_free)
@@
-63,7
+74,7
@@
memcached_server_st *memcached_server_clone(memcached_server_st *clone, memcache
new_clone->root= ptr->root;
host_reset(new_clone->root, new_clone,
new_clone->root= ptr->root;
host_reset(new_clone->root, new_clone,
- ptr->hostname, ptr->port,
+ ptr->hostname, ptr->port,
ptr->weight,
ptr->type);
return new_clone;
ptr->type);
return new_clone;