projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Pulling in Mark's fixes for memory leaks in memslap
[m6w6/libmemcached]
/
libmemcached
/
memcached_connect.c
diff --git
a/libmemcached/memcached_connect.c
b/libmemcached/memcached_connect.c
index ab4b84f0936d588cac7fe7671d25647742727809..5531ad792d47175439d22c469138dbdb99575872 100644
(file)
--- a/
libmemcached/memcached_connect.c
+++ b/
libmemcached/memcached_connect.c
@@
-1,5
+1,6
@@
#include "common.h"
#include <poll.h>
#include "common.h"
#include <poll.h>
+#include <sys/time.h>
static memcached_return set_hostinfo(memcached_server_st *server)
{
static memcached_return set_hostinfo(memcached_server_st *server)
{
@@
-210,6
+211,7
@@
test_connect:
{
ptr->cached_errno= errno;
WATCHPOINT_ERRNO(ptr->cached_errno);
{
ptr->cached_errno= errno;
WATCHPOINT_ERRNO(ptr->cached_errno);
+ WATCHPOINT_NUMBER(ptr->root->connect_timeout);
close(ptr->fd);
ptr->fd= -1;
return MEMCACHED_ERRNO;
close(ptr->fd);
ptr->fd= -1;
return MEMCACHED_ERRNO;