[trafficserver] branch master updated (019973a -> f7526b6)
This is an automated email from the ASF dual-hosted git repository. masaori pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git. from 019973a In CI, only run autopep8 on branches that enforce autopep8 (#7270) add f7526b6 Cleanup incoming PROXY Protocol v1 (#7331) No new revisions were added by this update. Summary of changes: iocore/net/I_NetVConnection.h | 91 +++- iocore/net/NetVConnection.cc| 57 + iocore/net/P_NetVConnection.h | 3 +- iocore/net/ProxyProtocol.cc | 161 +--- iocore/net/ProxyProtocol.h | 51 ++-- iocore/net/SSLNetVConnection.cc | 6 +- proxy/ProtocolProbeSessionAccept.cc | 6 +- proxy/http/HttpTransact.cc | 10 +-- proxy/http/HttpTransact.h | 2 +- proxy/logging/LogAccess.cc | 12 +-- 10 files changed, 188 insertions(+), 211 deletions(-)
[trafficserver] branch 9.0.x updated: Updated ChangeLog
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 b140306 Updated ChangeLog b140306 is described below commit b14030656330ed623cd1f9efe2f4f9abd9d16e29 Author: Leif Hedstrom AuthorDate: Mon Dec 7 14:16:19 2020 -0700 Updated ChangeLog --- CHANGELOG-9.0.0 | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG-9.0.0 b/CHANGELOG-9.0.0 index 1fe9f6d..79c3e17 100644 --- a/CHANGELOG-9.0.0 +++ b/CHANGELOG-9.0.0 @@ -1133,6 +1133,7 @@ Changes with Apache Traffic Server 9.0.0 #7313 - Make reloading client certificate configuration more reliable #7320 - Fix lookup split dns rule with fast path #7321 - Set thread mutex to the DNSHandler mutex of SplitDNS + #7336 - Adjust flags to ensure tunnel producer is cleaned up #7337 - Fix vc close migration race condition #7343 - Add note to background fetch about include/exclude #7360 - ESI: Ensure gzip header is always initialized
[trafficserver] branch 9.0.x updated: Adjust flags to ensure tunnel producer is cleaned up (#7336)
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 ee44a25 Adjust flags to ensure tunnel producer is cleaned up (#7336)
ee44a25 is described below
commit ee44a25e88e67d9d692b1f4e39400d53bf9d8971
Author: Susan Hinrichs
AuthorDate: Fri Dec 4 08:57:25 2020 -0600
Adjust flags to ensure tunnel producer is cleaned up (#7336)
(cherry picked from commit bb40940f394609ba359c9f2a132fae4af0e0e4cd)
---
proxy/http/HttpTunnel.cc | 16 ++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/proxy/http/HttpTunnel.cc b/proxy/http/HttpTunnel.cc
index 0dc0fb2..d7607fa 100644
--- a/proxy/http/HttpTunnel.cc
+++ b/proxy/http/HttpTunnel.cc
@@ -1332,9 +1332,21 @@ HttpTunnel::consumer_handler(int event,
HttpTunnelConsumer *c)
if (c->producer && c->producer->handler_state == 0) {
if (event == VC_EVENT_WRITE_COMPLETE) {
c->producer->handler_state = HTTP_SM_POST_SUCCESS;
-// If the consumer completed, presumably the producer successfully
read and is done
+// If the consumer completed, presumably the producer successfully read
c->producer->read_success = true;
-c->producer->alive= false;
+// Go ahead and clean up the producer side
+if (p->alive) {
+ p->alive = false;
+ if (p->read_vio) {
+p->bytes_read = p->read_vio->ndone;
+ } else {
+p->bytes_read = 0;
+ }
+ if (p->vc != HTTP_TUNNEL_STATIC_PRODUCER) {
+// Clear any outstanding reads
+p->vc->do_io_read(nullptr, 0, nullptr);
+ }
+}
} else if (c->vc_type == HT_HTTP_SERVER) {
c->producer->handler_state = HTTP_SM_POST_UA_FAIL;
} else if (c->vc_type == HT_HTTP_CLIENT) {
[trafficserver] branch master updated (c1b6e12 -> 019973a)
This is an automated email from the ASF dual-hosted git repository. bneradt pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git. from c1b6e12 Fix FreeBSD 12 link issue in test_libhttp2. (#7367) add 019973a In CI, only run autopep8 on branches that enforce autopep8 (#7270) No new revisions were added by this update. Summary of changes: ci/jenkins/bin/clang-format.sh | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-)
