projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix for valgrind issue around memcached_result_st not being free()
[m6w6/libmemcached]
/
libmemcached
/
connect.cc
diff --git
a/libmemcached/connect.cc
b/libmemcached/connect.cc
index 1c7da46547ad910aaf44d18d8e7373f6b0d08221..9d50e5c0dc05ecc1ad1f0ecd754077a1ff9eda15 100644
(file)
--- a/
libmemcached/connect.cc
+++ b/
libmemcached/connect.cc
@@
-78,6
+78,7
@@
static memcached_return_t connect_poll(memcached_server_st *server)
}
case 0:
{
}
case 0:
{
+ server->io_wait_count.timeouts++;
return memcached_set_error(*server, MEMCACHED_TIMEOUT, MEMCACHED_AT);
}
return memcached_set_error(*server, MEMCACHED_TIMEOUT, MEMCACHED_AT);
}
@@
-479,7
+480,10
@@
static memcached_return_t network_connect(memcached_server_st *server)
timeout_error_occured= true;
break;
timeout_error_occured= true;
break;
+ case EAGAIN:
+#if EWOULDBLOCK != EAGAIN
case EWOULDBLOCK:
case EWOULDBLOCK:
+#endif
case EINPROGRESS: // nonblocking mode - first return
case EALREADY: // nonblocking mode - subsequent returns
{
case EINPROGRESS: // nonblocking mode - first return
case EALREADY: // nonblocking mode - subsequent returns
{