projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Disable SO_SNDTIMEO and SO_RCVTIMEO on Solaris
[m6w6/libmemcached]
/
libmemcached
/
memcached_server.c
diff --git
a/libmemcached/memcached_server.c
b/libmemcached/memcached_server.c
index 1ee60101a8d32f07937ffdae1d9b04ebcf765210..c836cfa297f9de48b241d5f1e5d91a7f763e1d64 100644
(file)
--- a/
libmemcached/memcached_server.c
+++ b/
libmemcached/memcached_server.c
@@
-30,8
+30,7
@@
void memcached_server_free(memcached_server_st *ptr)
memcached_return rc;
WATCHPOINT_ASSERT(ptr->is_allocated != MEMCACHED_NOT_ALLOCATED);
memcached_return rc;
WATCHPOINT_ASSERT(ptr->is_allocated != MEMCACHED_NOT_ALLOCATED);
- rc= memcached_io_close(ptr);
- WATCHPOINT_ASSERT(rc == MEMCACHED_SUCCESS);
+ memcached_quit_server(ptr, 0);
if (ptr->address_info)
{
if (ptr->address_info)
{
@@
-75,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;