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 2020/03/30 16:42:16 UTC
[trafficserver] branch 8.0.x updated (7abeb75 -> d60bf6a)
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a change to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.
from 7abeb75 Fixes crash in SNIConfigParams::cleanup() (#6526)
new 4cdb42b Remove the ignore_keep_alive method entirely
new d60bf6a Fix tunnel crash
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/ProxyClientTransaction.h | 6 ------
proxy/http/Http1ClientTransaction.h | 6 ------
proxy/http/HttpTransact.cc | 2 +-
proxy/http/HttpTunnel.cc | 5 +++++
proxy/http2/Http2Stream.h | 7 -------
5 files changed, 6 insertions(+), 20 deletions(-)
[trafficserver] 02/02: Fix tunnel crash
Posted by zw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit d60bf6aaa2f1ade9b9f5ff30b4a4ceae3788a7c9
Author: Susan Hinrichs <sh...@verizonmedia.com>
AuthorDate: Thu Mar 26 21:56:00 2020 +0000
Fix tunnel crash
(cherry picked from commit ba868d88a3f2ce4c58e48e2b7b5878a45c2922c4)
---
proxy/http/HttpTunnel.cc | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/proxy/http/HttpTunnel.cc b/proxy/http/HttpTunnel.cc
index 404b4f3..48aebb8 100644
--- a/proxy/http/HttpTunnel.cc
+++ b/proxy/http/HttpTunnel.cc
@@ -965,6 +965,11 @@ HttpTunnel::producer_run(HttpTunnelProducer *p)
for (c = p->consumer_list.head; c; c = c->link.next) {
int64_t c_write = consumer_n;
+ // Don't bother to set up the consumer if it is dead
+ if (!c->alive) {
+ continue;
+ }
+
if (!p->alive) {
// Adjust the amount of chunked data to write if the only data was in the initial read
// The amount to write in some cases is dependent on the type of the consumer, so this
[trafficserver] 01/02: Remove the ignore_keep_alive method entirely
Posted by zw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 8.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 4cdb42b4b2cf175c3eb0ff4f567a3394ce37ff66
Author: Susan Hinrichs <sh...@oath.com>
AuthorDate: Thu Aug 2 13:44:54 2018 +0000
Remove the ignore_keep_alive method entirely
(cherry picked from commit da9edd5feba06da6ebbe47eaf9696c37c5483fa1)
---
proxy/ProxyClientTransaction.h | 6 ------
proxy/http/Http1ClientTransaction.h | 6 ------
proxy/http/HttpTransact.cc | 2 +-
proxy/http2/Http2Stream.h | 7 -------
4 files changed, 1 insertion(+), 20 deletions(-)
diff --git a/proxy/ProxyClientTransaction.h b/proxy/ProxyClientTransaction.h
index 12fcf30..86f7b65 100644
--- a/proxy/ProxyClientTransaction.h
+++ b/proxy/ProxyClientTransaction.h
@@ -196,12 +196,6 @@ public:
{
}
- virtual bool
- ignore_keep_alive()
- {
- return true;
- }
-
virtual void destroy();
virtual void transaction_done() = 0;
diff --git a/proxy/http/Http1ClientTransaction.h b/proxy/http/Http1ClientTransaction.h
index 0251b2c..8a87666 100644
--- a/proxy/http/Http1ClientTransaction.h
+++ b/proxy/http/Http1ClientTransaction.h
@@ -81,12 +81,6 @@ public:
void release(IOBufferReader *r) override;
- bool
- ignore_keep_alive() override
- {
- return false;
- }
-
bool allow_half_open() const override;
void set_parent(ProxyClientSession *new_parent) override;
diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc
index 5629521..0a7d710 100644
--- a/proxy/http/HttpTransact.cc
+++ b/proxy/http/HttpTransact.cc
@@ -5451,7 +5451,7 @@ HttpTransact::initialize_state_variables_from_request(State *s, HTTPHdr *obsolet
}
// If this is an internal request, never keep alive
- if (!s->txn_conf->keep_alive_enabled_in || (s->state_machine->ua_txn && s->state_machine->ua_txn->ignore_keep_alive())) {
+ if (!s->txn_conf->keep_alive_enabled_in) {
s->client_info.keep_alive = HTTP_NO_KEEPALIVE;
} else if (vc && vc->get_is_internal_request()) {
// Following the trail of JIRAs back from TS-4960, there can be issues with
diff --git a/proxy/http2/Http2Stream.h b/proxy/http2/Http2Stream.h
index 3be1057..68099d2 100644
--- a/proxy/http2/Http2Stream.h
+++ b/proxy/http2/Http2Stream.h
@@ -142,13 +142,6 @@ public:
void signal_write_event(bool call_update);
void reenable(VIO *vio) override;
void transaction_done() override;
- bool
- ignore_keep_alive() override
- {
- // If we return true here, Connection header will always be "close".
- // It should be handled as the same as HTTP/1.1
- return false;
- }
void restart_sending();
void push_promise(URL &url, const MIMEField *accept_encoding);