You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by sh...@apache.org on 2017/03/03 14:23:37 UTC

[trafficserver] branch master updated: When SSL connect fails, we return 502 success

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

shinrich pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/trafficserver.git

The following commit(s) were added to refs/heads/master by this push:
       new  0a87af6   When SSL connect fails, we return 502 success
0a87af6 is described below

commit 0a87af6a5145608efdf1845a59796aa939bda635
Author: Susan Hinrichs <sh...@ieee.org>
AuthorDate: Wed Mar 1 21:33:23 2017 +0000

    When SSL connect fails, we return 502 success
---
 iocore/net/SSLNetVConnection.cc | 2 +-
 proxy/http/HttpTransact.cc      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc
index 50f4bdc..6f2784c 100644
--- a/iocore/net/SSLNetVConnection.cc
+++ b/iocore/net/SSLNetVConnection.cc
@@ -1321,7 +1321,7 @@ SSLNetVConnection::sslClientHandShakeEvent(int &err)
 
   case SSL_ERROR_SSL:
   default: {
-    err = errno;
+    err = (errno) ? errno : -ENET_CONNECT_FAILED;
     // FIXME -- This triggers a retry on cases of cert validation errors....
     Debug("ssl", "SSLNetVConnection::sslClientHandShakeEvent, SSL_ERROR_SSL");
     SSL_CLR_ERR_INCR_DYN_STAT(this, ssl_error_ssl, "SSLNetVConnection::sslClientHandShakeEvent, SSL_ERROR_SSL errno=%d", errno);
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index 4800753..71de6e1 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -8347,6 +8347,8 @@ HttpTransact::get_error_string(int erno)
     //              when HttpSM.cc::state_origin_server_read_response
     //                 receives an HTTP_EVENT_EOS. (line 1729 in HttpSM.cc,
     //                 version 1.145.2.13.2.57)
+    case ENET_CONNECT_FAILED:
+      return ("connect failed");
     case UNKNOWN_INTERNAL_ERROR:
       return ("internal error - server connection terminated");
     default:

-- 
To stop receiving notification emails like this one, please contact
['"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>'].