From 8f47b68a9526f4f2be2f31e73112f49b59359d97 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Tue, 23 Aug 2016 21:36:43 +0900 Subject: [PATCH] nghttpx: Set do_signal_write_ when TLS handshake was completed --- src/shrpx_http_downstream_connection.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/shrpx_http_downstream_connection.cc b/src/shrpx_http_downstream_connection.cc index da1c6fd0..ae398122 100644 --- a/src/shrpx_http_downstream_connection.cc +++ b/src/shrpx_http_downstream_connection.cc @@ -994,6 +994,8 @@ int HttpDownstreamConnection::tls_handshake() { auto &connect_blocker = addr_->connect_blocker; + do_signal_write_ = &HttpDownstreamConnection::actual_signal_write; + connect_blocker->on_success(); ev_set_cb(&conn_.rt, timeoutcb); @@ -1160,8 +1162,6 @@ int HttpDownstreamConnection::connected() { ev_set_cb(&conn_.wev, writecb); - do_signal_write_ = &HttpDownstreamConnection::actual_signal_write; - if (conn_.tls.ssl) { do_read_ = &HttpDownstreamConnection::tls_handshake; do_write_ = &HttpDownstreamConnection::tls_handshake; @@ -1169,6 +1169,8 @@ int HttpDownstreamConnection::connected() { return 0; } + do_signal_write_ = &HttpDownstreamConnection::actual_signal_write; + connect_blocker->on_success(); ev_set_cb(&conn_.rt, timeoutcb);