From 8429a2ba768cbed8c2fb769fdfead5ae0f336826 Mon Sep 17 00:00:00 2001 From: Susan Hinrichs Date: Thu, 31 Jan 2019 22:48:11 +0000 Subject: [PATCH] Adjust connection timeout for TLS (cherry picked from commit 33818ba9aa228bd451b004d2d5f408fad7471a60) Conflicts: proxy/http/HttpSM.cc --- iocore/net/UnixNetVConnection.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/iocore/net/UnixNetVConnection.cc b/iocore/net/UnixNetVConnection.cc index efb7579d04f..13fa4dd06ca 100644 --- a/iocore/net/UnixNetVConnection.cc +++ b/iocore/net/UnixNetVConnection.cc @@ -376,8 +376,9 @@ write_to_net_io(NetHandler *nh, UnixNetVConnection *vc, EThread *thread) // vc is an SSLNetVConnection. if (!vc->getSSLHandShakeComplete()) { if (vc->trackFirstHandshake()) { - // Send the write ready on up to the state machine - write_signal_and_update(VC_EVENT_WRITE_READY, vc); + // Eat the first write-ready. Until the TLS handshake is complete, + // we should still be under the connect timeout and shouldn't bother + // the state machine until the TLS handshake is complete vc->write.triggered = 0; nh->write_ready_list.remove(vc); }