nghttpx: Call disconnect() when memcached connection cannot be made

6ad332b8 · Tatsuhiro Tsujikawa · f1b163a3 · 6ad332b8
Commit 6ad332b8 authored Jul 28, 2015 by Tatsuhiro Tsujikawa
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

src/shrpx_memcached_connection.cc src/shrpx_memcached_connection.cc +3 -4

No files found.
--- a/src/shrpx_memcached_connection.cc
+++ b/src/shrpx_memcached_connection.cc
@@ -532,10 +532,9 @@ int MemcachedConnection::add_request(std::unique_ptr<MemcachedRequest> req) {
    return 0;
  }
-  if (conn_.fd == -1) {
+  if (conn_.fd == -1 && initiate_connection() != 0) {
-    if (initiate_connection() != 0) {
+    disconnect();
-      return -1;
+    return -1;
-    }
  }
  return 0;