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/03/01 17:40:57 UTC
[trafficserver] branch 9.0.x updated (6597169 -> 4343d2d)
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.
from 6597169 Updated ChangeLog
new 20388c2 Use Proxy-Connection iff parent_is_proxy=true
new 4343d2d Fix KA header not checking strategy (#7483)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
proxy/http/HttpTransact.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[trafficserver] 01/02: Use Proxy-Connection iff parent_is_proxy=true
Posted by zw...@apache.org.
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
commit 20388c277319006973c7a01fcf4d25df80a7f31e
Author: Valentin Gutierrez <vg...@wikimedia.org>
AuthorDate: Thu May 14 16:11:36 2020 +0000
Use Proxy-Connection iff parent_is_proxy=true
Prior to this change a parent proxy configured as parent_is_proxy=false
would get Proxy-Connection: keep-alive|close instead of
Connection: keep-alive|close
(cherry picked from commit ebc431431f4a13ac7e661a168c42a3b81c0176d9)
---
proxy/http/HttpTransact.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index eff9c3b..106da00 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -6890,7 +6890,7 @@ HttpTransact::handle_request_keep_alive_headers(State *s, HTTPVersion ver, HTTPH
case KA_CONNECTION:
ink_assert(s->current.server->keep_alive != HTTP_NO_KEEPALIVE);
if (ver == HTTPVersion(1, 0)) {
- if (s->current.request_to == PARENT_PROXY) {
+ if (s->current.request_to == PARENT_PROXY && s->parent_result.parent_is_proxy()) {
heads->value_set(MIME_FIELD_PROXY_CONNECTION, MIME_LEN_PROXY_CONNECTION, "keep-alive", 10);
} else {
heads->value_set(MIME_FIELD_CONNECTION, MIME_LEN_CONNECTION, "keep-alive", 10);
@@ -6904,7 +6904,7 @@ HttpTransact::handle_request_keep_alive_headers(State *s, HTTPVersion ver, HTTPH
if (s->current.server->keep_alive != HTTP_NO_KEEPALIVE || (ver == HTTPVersion(1, 1))) {
/* Had keep-alive */
s->current.server->keep_alive = HTTP_NO_KEEPALIVE;
- if (s->current.request_to == PARENT_PROXY) {
+ if (s->current.request_to == PARENT_PROXY && s->parent_result.parent_is_proxy()) {
heads->value_set(MIME_FIELD_PROXY_CONNECTION, MIME_LEN_PROXY_CONNECTION, "close", 5);
} else {
heads->value_set(MIME_FIELD_CONNECTION, MIME_LEN_CONNECTION, "close", 5);
[trafficserver] 02/02: Fix KA header not checking strategy (#7483)
Posted by zw...@apache.org.
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
commit 4343d2dd13f785f39353be8f824bec374320006c
Author: Robert O Butts <ro...@users.noreply.github.com>
AuthorDate: Thu Feb 25 16:01:45 2021 -0700
Fix KA header not checking strategy (#7483)
Fixes handle_request_keep_alive_headers directly checking the old
parentage for parent_is_proxy, instead of the abstract func which
checks the strategy if it exists.
This would cause the Connection header to get added instead of the
correct Proxy-Connection when Strategies are used.
(cherry picked from commit e24c79a4a530dc9b12880503e8c047e5610c3224)
---
proxy/http/HttpTransact.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index 106da00..0674f35 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -6890,7 +6890,7 @@ HttpTransact::handle_request_keep_alive_headers(State *s, HTTPVersion ver, HTTPH
case KA_CONNECTION:
ink_assert(s->current.server->keep_alive != HTTP_NO_KEEPALIVE);
if (ver == HTTPVersion(1, 0)) {
- if (s->current.request_to == PARENT_PROXY && s->parent_result.parent_is_proxy()) {
+ if (s->current.request_to == PARENT_PROXY && parent_is_proxy(s)) {
heads->value_set(MIME_FIELD_PROXY_CONNECTION, MIME_LEN_PROXY_CONNECTION, "keep-alive", 10);
} else {
heads->value_set(MIME_FIELD_CONNECTION, MIME_LEN_CONNECTION, "keep-alive", 10);
@@ -6904,7 +6904,7 @@ HttpTransact::handle_request_keep_alive_headers(State *s, HTTPVersion ver, HTTPH
if (s->current.server->keep_alive != HTTP_NO_KEEPALIVE || (ver == HTTPVersion(1, 1))) {
/* Had keep-alive */
s->current.server->keep_alive = HTTP_NO_KEEPALIVE;
- if (s->current.request_to == PARENT_PROXY && s->parent_result.parent_is_proxy()) {
+ if (s->current.request_to == PARENT_PROXY && parent_is_proxy(s)) {
heads->value_set(MIME_FIELD_PROXY_CONNECTION, MIME_LEN_PROXY_CONNECTION, "close", 5);
} else {
heads->value_set(MIME_FIELD_CONNECTION, MIME_LEN_CONNECTION, "close", 5);