You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2021/02/24 21:55:32 UTC
[trafficserver] branch 9.1.x updated: Fix parent.config to 504 not
502 on timeout (#7558)
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 <ro...@users.noreply.github.com>
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);
}