[trafficserver] branch 8.1.x updated: Adjust connection timeout for TLS (#7810)

[eze]

This is an automated email from the ASF dual-hosted git repository.

eze pushed a commit to branch 8.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/8.1.x by this push:
     new fb4574b  Adjust connection timeout for TLS (#7810)
fb4574b is described below

commit fb4574b06c1ded416ecaf00fabb5b0e4269484ae
Author: Masaori Koshiba <masa...@apache.org>
AuthorDate: Wed May 12 09:43:41 2021 +0900

    Adjust connection timeout for TLS (#7810)
    
    (cherry picked from commit 33818ba9aa228bd451b004d2d5f408fad7471a60)
    
    Conflicts:
        proxy/http/HttpSM.cc
    
    Co-authored-by: Susan Hinrichs <shinr...@oath.com>
---
 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 efb7579..13fa4dd 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);
     }