[trafficserver] branch 9.0.x updated: Updated ChangeLog

2021-02-24 Thread zwoop
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new c1f0975  Updated ChangeLog
c1f0975 is described below

commit c1f0975491e4ab58940391b47f23903d08271224
Author: Leif Hedstrom 
AuthorDate: Wed Feb 24 16:05:49 2021 -0700

Updated ChangeLog
---
 CHANGELOG-9.0.1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG-9.0.1 b/CHANGELOG-9.0.1
index 7fe91eb..bfc7d6d 100644
--- a/CHANGELOG-9.0.1
+++ b/CHANGELOG-9.0.1
@@ -34,10 +34,11 @@ Changes with Apache Traffic Server 9.0.1
   #7486 - slice/server: handleFirstServerHeader exit sooner on detected 
requested range errors.
   #7490 - Fix out of bounds access error in ats_base64_decode
   #7493 - AuTest: Upgrade to Proxy Verifier 2.0.2
-  #7495 - Add zlib1g-dev to Debian dependencies in README (#7303)
+  #7495 - Add zlib1g-dev to Debian dependencies in README
   #7506 - Fixed build issues with Fedora 34
   #7507 - Fixing DNS local_ipv* config option
   #7526 - Fix out of bounds access error in jtest
   #7534 - Updating to use Proxy Verifier 2.1.0
   #7549 - Release Notes update on HTTP/2 disabling in v9.x
   #7551 - Removes the test plugins from the .spec file / RPM
+  #7558 - Fix parent.config timeouts to return a 504 not 502 on timeout



[trafficserver] branch 9.1.x updated: Fix parent.config to 504 not 502 on timeout (#7558)

2021-02-24 Thread zwoop
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.1.x by this push:
 new f2f6125  Fix parent.config to 504 not 502 on timeout (#7558)
f2f6125 is described below

commit f2f6125bcfcc58c5f2c8e39a268301824ec61424
Author: Robert O Butts 
AuthorDate: Wed Feb 24 12:19:51 2021 -0700

Fix parent.config to 504 not 502 on timeout (#7558)

(cherry picked from commit 564663b9b6888c8334ec8077b5583da9b192c3c2)
---
 proxy/http/HttpTransact.cc | 14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index 6e53a9a..3669169 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -7471,10 +7471,18 @@ HttpTransact::handle_parent_died(State *s)
 {
   ink_assert(s->parent_result.result == PARENT_FAIL);
 
-  if (s->current.state == OUTBOUND_CONGESTION) {
+  switch (s->current.state) {
+  case OUTBOUND_CONGESTION:
 build_error_response(s, HTTP_STATUS_SERVICE_UNAVAILABLE, "Next Hop 
Congested", "congestion#retryAfter");
-  } else {
-build_error_response(s, HTTP_STATUS_BAD_GATEWAY, "Next Hop Connection 
Failed", "connect#failed_connect");
+break;
+  case INACTIVE_TIMEOUT:
+build_error_response(s, HTTP_STATUS_GATEWAY_TIMEOUT, "Next Hop Timeout", 
"timeout#inactivity");
+break;
+  case ACTIVE_TIMEOUT:
+build_error_response(s, HTTP_STATUS_GATEWAY_TIMEOUT, "Next Hop Timeout", 
"timeout#activity");
+break;
+  default:
+build_error_response(s, HTTP_STATUS_BAD_GATEWAY, "Next Hop Connection 
Failed", "connect");
   }
   TRANSACT_RETURN(SM_ACTION_SEND_ERROR_CACHE_NOOP, nullptr);
 }



[trafficserver] branch 9.0.x updated: Fix parent.config to 504 not 502 on timeout (#7558)

2021-02-24 Thread zwoop
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 355ab02  Fix parent.config to 504 not 502 on timeout (#7558)
355ab02 is described below

commit 355ab02f7324f2a78ba6555dcc19f0f8c8d22090
Author: Robert O Butts 
AuthorDate: Wed Feb 24 12:19:51 2021 -0700

Fix parent.config to 504 not 502 on timeout (#7558)

(cherry picked from commit 564663b9b6888c8334ec8077b5583da9b192c3c2)
---
 proxy/http/HttpTransact.cc | 14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index f7fdf5f..eff9c3b 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -7600,10 +7600,18 @@ HttpTransact::handle_parent_died(State *s)
 {
   ink_assert(s->parent_result.result == PARENT_FAIL);
 
-  if (s->current.state == OUTBOUND_CONGESTION) {
+  switch (s->current.state) {
+  case OUTBOUND_CONGESTION:
 build_error_response(s, HTTP_STATUS_SERVICE_UNAVAILABLE, "Next Hop 
Congested", "congestion#retryAfter");
-  } else {
-build_error_response(s, HTTP_STATUS_BAD_GATEWAY, "Next Hop Connection 
Failed", "connect#failed_connect");
+break;
+  case INACTIVE_TIMEOUT:
+build_error_response(s, HTTP_STATUS_GATEWAY_TIMEOUT, "Next Hop Timeout", 
"timeout#inactivity");
+break;
+  case ACTIVE_TIMEOUT:
+build_error_response(s, HTTP_STATUS_GATEWAY_TIMEOUT, "Next Hop Timeout", 
"timeout#activity");
+break;
+  default:
+build_error_response(s, HTTP_STATUS_BAD_GATEWAY, "Next Hop Connection 
Failed", "connect");
   }
   TRANSACT_RETURN(SM_ACTION_SEND_ERROR_CACHE_NOOP, nullptr);
 }



[trafficserver] branch master updated (3c16551 -> 564663b)

2021-02-24 Thread jrushford
This is an automated email from the ASF dual-hosted git repository.

jrushford pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.


from 3c16551  use SSL_CTX address as part of the lookup key (#7552)
 add 564663b  Fix parent.config to 504 not 502 on timeout (#7558)

No new revisions were added by this update.

Summary of changes:
 proxy/http/HttpTransact.cc | 14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)



[trafficserver] branch master updated (e629118 -> 3c16551)

2021-02-24 Thread duke8253
This is an automated email from the ASF dual-hosted git repository.

duke8253 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.


from e629118  Add ALPN support on TLS Partial Blind Tunnel (#7511)
 add 3c16551  use SSL_CTX address as part of the lookup key (#7552)

No new revisions were added by this update.

Summary of changes:
 iocore/net/P_SSLUtils.h|  4 ++
 iocore/net/SSLClientUtils.cc   | 35 --
 iocore/net/SSLSessionCache.cc  |  8 +--
 iocore/net/SSLUtils.cc | 61 +++--
 .../tls/tls_origin_session_reuse.test.py   | 77 --
 5 files changed, 87 insertions(+), 98 deletions(-)