From ecfd593076312829670ab6e19304e217469cf4a9 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Fri, 23 Jan 2015 23:00:18 +0900
Subject: [PATCH] nghttpx: Call ConnectBlocker::on_success when connection is
 established

---
 src/shrpx_http_downstream_connection.cc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/shrpx_http_downstream_connection.cc b/src/shrpx_http_downstream_connection.cc
index b44810e8..3c6e87eb 100644
--- a/src/shrpx_http_downstream_connection.cc
+++ b/src/shrpx_http_downstream_connection.cc
@@ -194,8 +194,6 @@ int HttpDownstreamConnection::attach_downstream(Downstream *downstream) {
         continue;
       }
 
-      connect_blocker->on_success();
-
       if (LOG_ENABLED(INFO)) {
         DCLOG(INFO, this) << "Connecting to downstream server";
       }
@@ -753,17 +751,20 @@ end:
 }
 
 int HttpDownstreamConnection::on_connect() {
+  auto connect_blocker = client_handler_->get_http1_connect_blocker();
+
   if (!util::check_socket_connected(fd_)) {
     ev_io_stop(loop_, &wev_);
 
     if (LOG_ENABLED(INFO)) {
       DLOG(INFO, this) << "downstream connect failed";
     }
-    auto connect_blocker = client_handler_->get_http1_connect_blocker();
     connect_blocker->on_failure();
     return -1;
   }
 
+  connect_blocker->on_success();
+
   ev_io_start(loop_, &rev_);
   ev_set_cb(&wev_, writecb);