[trafficserver] branch 8.1.x updated: Fix out of bounds access error in jtest (#7526) (#7660)
This is an automated email from the ASF dual-hosted git repository.
maskit pushed a commit to branch 8.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/8.1.x by this push:
new 6fca51d Fix out of bounds access error in jtest (#7526) (#7660)
6fca51d is described below
commit 6fca51d3629bf50d3e1df5f939d3b0f730a11c15
Author: Masakazu Kitajo
AuthorDate: Thu Apr 8 08:20:01 2021 +0900
Fix out of bounds access error in jtest (#7526) (#7660)
(cherry picked from commit 7a7a89960ce71be9fce3b0bcf5eb4f7c169903ca)
---
tools/jtest/jtest.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/jtest/jtest.cc b/tools/jtest/jtest.cc
index 2075b99..f12bdba 100644
--- a/tools/jtest/jtest.cc
+++ b/tools/jtest/jtest.cc
@@ -4800,7 +4800,7 @@ ink_web_escapify_string(char *dest_in, char *src_in, int
max_dest_len)
int quit = 0;
while ((*src != 0) && (dcount < max_dest_len) && (quit == 0)) {
-if ((char *)memchr(dontescapify, *src, INT_MAX) ||
ParseRules::is_alpha(*src) || ParseRules::is_digit(*src)) {
+if ((char *)strchr(dontescapify, *src) || ParseRules::is_alpha(*src) ||
ParseRules::is_digit(*src)) {
/* this is regular character, don't escapify it */
if (dcount + 1 < max_dest_len) {
*dest++ = *src;
[trafficserver] branch 8.1.x updated: Updating to AuTest 1.10.0 (#7686)
This is an automated email from the ASF dual-hosted git repository.
bneradt pushed a commit to branch 8.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/8.1.x by this push:
new 61da91d Updating to AuTest 1.10.0 (#7686)
61da91d is described below
commit 61da91d4e49ba4c1de61c654cb6bcbec51458bd7
Author: Brian Neradt
AuthorDate: Wed Apr 7 11:08:30 2021 -0500
Updating to AuTest 1.10.0 (#7686)
This new release supports case-insensitive gold files. We intend to use
this for HTTP/2 curl AuTest gold files which, depending upon the version
of curl, may or may not lowercase field names.
(cherry picked from commit 4c882701eac237614aea24485da4233a7aed99ce)
Conflicts:
tests/Pipfile
tests/gold_tests/autest-site/init.cli.ext
---
tests/Pipfile | 5 -
tests/gold_tests/autest-site/init.cli.ext | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/tests/Pipfile b/tests/Pipfile
index 5586503..fdfb7e3 100644
--- a/tests/Pipfile
+++ b/tests/Pipfile
@@ -24,7 +24,10 @@ autopep8 = "*"
pyflakes = "*"
[packages]
-autest = "==1.8.0"
+
+# Keep init.cli.ext updated with this required autest version.
+autest = "==1.10.0"
+
traffic-replay = "*" # this should install TRLib, MicroServer, MicroDNS,
Traffic-Replay
hyper = "*"
dnslib = "*"
diff --git a/tests/gold_tests/autest-site/init.cli.ext
b/tests/gold_tests/autest-site/init.cli.ext
index 28ed574..9e3ee8e 100644
--- a/tests/gold_tests/autest-site/init.cli.ext
+++ b/tests/gold_tests/autest-site/init.cli.ext
@@ -23,7 +23,7 @@ if sys.version_info < (3, 5, 0):
host.WriteError(
"You need python 3.5 or later to run these tests\n", show_stack=False)
-autest_version ="1.7.0"
+autest_version ="1.10.0"
if AuTestVersion() < autest_version:
host.WriteError(
"Tests need AuTest version {ver} or better\n Please update AuTest:\n
pip install --upgrade autest\n".format(ver=autest_version), show_stack=False)
[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 3bb1ae9 Updated ChangeLog 3bb1ae9 is described below commit 3bb1ae9fa5c71b8e65cb782f402d8780b522693d Author: Leif Hedstrom AuthorDate: Wed Apr 7 09:39:56 2021 -0600 Updated ChangeLog --- CHANGELOG-9.0.1 | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG-9.0.1 b/CHANGELOG-9.0.1 index 36212fb..e5f302e 100644 --- a/CHANGELOG-9.0.1 +++ b/CHANGELOG-9.0.1 @@ -50,6 +50,7 @@ Changes with Apache Traffic Server 9.0.1 #7558 - Fix parent.config timeouts to return a 504 not 502 on timeout #7564 - Fix compress issues with 304s, only looks at 304 headers #7576 - Add thread yield to avoid busy waiting in LogObject::_checkout_write(). + #7583 - Rollback LAZY_BUF_ALLOC remove in HttpTunnel #7592 - Remove inline for detail::cache::CacheData::idAddr #7596 - Remove UnixNetVConnection::startEvent - not actually called. #7602 - Fix the connection limit crash while using parents
[trafficserver] branch 9.1.x updated: Rollback LAZY_BUF_ALLOC remove in HttpTunnel (#7583)
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 d33db23 Rollback LAZY_BUF_ALLOC remove in HttpTunnel (#7583)
d33db23 is described below
commit d33db239046eb984bcb90ce19aa87c197e62b889
Author: Masaori Koshiba
AuthorDate: Thu Apr 8 00:28:22 2021 +0900
Rollback LAZY_BUF_ALLOC remove in HttpTunnel (#7583)
(cherry picked from commit 9ed916c7d08d357e02da8824c3df6d2a526eca7a)
---
proxy/http/HttpTunnel.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/proxy/http/HttpTunnel.cc b/proxy/http/HttpTunnel.cc
index 6192516..53596f3 100644
--- a/proxy/http/HttpTunnel.cc
+++ b/proxy/http/HttpTunnel.cc
@@ -1234,7 +1234,7 @@ HttpTunnel::consumer_reenable(HttpTunnelConsumer *c)
{
HttpTunnelProducer *p = c->producer;
- if (p && p->alive && p->read_buffer->write_avail() > 0) {
+ if (p && p->alive) {
// Only do flow control if enabled and the producer is an external
// source. Otherwise disable by making the backlog zero. Because
// the backlog short cuts quit when the value is equal (or
@@ -1370,7 +1370,7 @@ HttpTunnel::consumer_handler(int event,
HttpTunnelConsumer *c)
//the SM since the reenabling has the side effect
//updating the buffer state for the VConnection
//that is being reenabled
-if (p->alive && p->read_vio && p->read_buffer->write_avail() > 0) {
+if (p->alive && p->read_vio) {
if (p->is_throttled()) {
this->consumer_reenable(c);
} else {
[trafficserver] branch master updated (739994f -> 9ed916c)
This is an automated email from the ASF dual-hosted git repository. zwoop pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git. from 739994f Add class to normalize handling of pending action (#7667) add 9ed916c Rollback LAZY_BUF_ALLOC remove in HttpTunnel (#7583) No new revisions were added by this update. Summary of changes: proxy/http/HttpTunnel.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[trafficserver] branch master updated (a8b6746 -> 739994f)
This is an automated email from the ASF dual-hosted git repository. shinrich pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git. from a8b6746 Make HTTP/2 Curl AuTest gold files case insensitive (#7683) add 739994f Add class to normalize handling of pending action (#7667) No new revisions were added by this update. Summary of changes: proxy/http/HttpSM.cc | 159 ++- proxy/http/HttpSM.h | 45 ++- 2 files changed, 87 insertions(+), 117 deletions(-)
[trafficserver] branch cherry_pick_h2_case_insensitive_gold_files_81x created (now 381e27c)
This is an automated email from the ASF dual-hosted git repository. bneradt pushed a change to branch cherry_pick_h2_case_insensitive_gold_files_81x in repository https://gitbox.apache.org/repos/asf/trafficserver.git. at 381e27c Make HTTP/2 Curl AuTest gold files case insensitive This branch includes the following new commits: new 381e27c Make HTTP/2 Curl AuTest gold files case insensitive The 1 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.
[trafficserver] 01/01: Make HTTP/2 Curl AuTest gold files case insensitive
This is an automated email from the ASF dual-hosted git repository.
bneradt pushed a commit to branch cherry_pick_h2_case_insensitive_gold_files_81x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 381e27c172f9ea7b573bf72ae38f290dab7f26c5
Author: Brian Neradt
AuthorDate: Wed Apr 7 09:47:05 2021 -0500
Make HTTP/2 Curl AuTest gold files case insensitive
Newer versions of Curl (7.67.0) lowercase HTTP/2 field names in
compliance with the HTTP/2 spec. Since some devs will have newer and
some older versions of Curl, this accommodates both by making the HTTP/2
gold files for AuTests match case-insensitively.
(cherry picked from commit a8b6746d303c4fafdc2e609941750fc4c2ac9b14)
---
tests/gold_tests/h2/http2.test.py | 6 --
tests/gold_tests/h2/http2_priority.test.py | 3 ++-
tests/gold_tests/h2/httpbin.test.py| 12
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/tests/gold_tests/h2/http2.test.py
b/tests/gold_tests/h2/http2.test.py
index fd139a3..b28d134 100644
--- a/tests/gold_tests/h2/http2.test.py
+++ b/tests/gold_tests/h2/http2.test.py
@@ -184,7 +184,8 @@ tr = Test.AddTestRun()
tr.Processes.Default.Command = 'curl -vs -k --http2
https://127.0.0.1:{0}/huge_resp_hdrs'.format(ts.Variables.ssl_port)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/http2_8_stdout.gold"
-tr.Processes.Default.Streams.stderr = "gold/http2_8_stderr.gold"
+# Different versions of curl will have different cases for HTTP/2 field names.
+tr.Processes.Default.Streams.stderr =
Testers.GoldFile("gold/http2_8_stderr.gold", case_insensitive=True)
tr.StillRunningAfter = server
# Test Case 9: Header Only Response - e.g. 204
@@ -192,5 +193,6 @@ tr = Test.AddTestRun()
tr.Processes.Default.Command = 'curl -vs -k --http2
https://127.0.0.1:{0}/status/204'.format(ts.Variables.ssl_port)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/http2_9_stdout.gold"
-tr.Processes.Default.Streams.stderr = "gold/http2_9_stderr.gold"
+# Different versions of curl will have different cases for HTTP/2 field names.
+tr.Processes.Default.Streams.stderr =
Testers.GoldFile("gold/http2_9_stderr.gold", case_insensitive=True)
tr.StillRunningAfter = server
diff --git a/tests/gold_tests/h2/http2_priority.test.py
b/tests/gold_tests/h2/http2_priority.test.py
index ac85328..6bcfd5a 100644
--- a/tests/gold_tests/h2/http2_priority.test.py
+++ b/tests/gold_tests/h2/http2_priority.test.py
@@ -81,5 +81,6 @@ tr.Processes.Default.TimeOut = 5
tr.Processes.Default.StartBefore(server,
ready=When.PortOpen(server.Variables.Port))
tr.Processes.Default.StartBefore(Test.Processes.ts,
ready=When.PortOpen(ts.Variables.ssl_port))
tr.Processes.Default.Streams.stdout = "gold/priority_0_stdout.gold"
-tr.Processes.Default.Streams.stderr = "gold/priority_0_stderr.gold"
+# Different versions of curl will have different cases for HTTP/2 field names.
+tr.Processes.Default.Streams.stderr =
Testers.GoldFile("gold/priority_0_stderr.gold", case_insensitive=True)
tr.StillRunningAfter = server
diff --git a/tests/gold_tests/h2/httpbin.test.py
b/tests/gold_tests/h2/httpbin.test.py
index 388df74..3279a99 100644
--- a/tests/gold_tests/h2/httpbin.test.py
+++ b/tests/gold_tests/h2/httpbin.test.py
@@ -95,7 +95,8 @@ test_run.Processes.Default.ReturnCode = 0
test_run.Processes.Default.StartBefore(httpbin,
ready=When.PortOpen(httpbin.Variables.Port))
test_run.Processes.Default.StartBefore(Test.Processes.ts,
ready=When.PortOpen(ts.Variables.ssl_port))
test_run.Processes.Default.Streams.stdout = "gold/httpbin_0_stdout.gold"
-test_run.Processes.Default.Streams.stderr = "gold/httpbin_0_stderr.gold"
+# Different versions of curl will have different cases for HTTP/2 field names.
+test_run.Processes.Default.Streams.stderr =
Testers.GoldFile("gold/httpbin_0_stderr.gold", case_insensitive=True)
test_run.StillRunningAfter = httpbin
# Test Case 1: Empty response body
@@ -103,7 +104,8 @@ test_run = Test.AddTestRun()
test_run.Processes.Default.Command = 'curl -vs -k --http2
https://127.0.0.1:{0}/bytes/0'.format(ts.Variables.ssl_port)
test_run.Processes.Default.ReturnCode = 0
test_run.Processes.Default.Streams.stdout = "gold/httpbin_1_stdout.gold"
-test_run.Processes.Default.Streams.stderr = "gold/httpbin_1_stderr.gold"
+# Different versions of curl will have different cases for HTTP/2 field names.
+test_run.Processes.Default.Streams.stderr =
Testers.GoldFile("gold/httpbin_1_stderr.gold", case_insensitive=True)
test_run.StillRunningAfter = httpbin
# Test Case 2: Chunked
@@ -112,7 +114,8 @@ test_run.Processes.Default.Command = 'curl -vs -k --http2
https://127.0.0.1:{0}/
ts.Variables.ssl_port)
test_run.Processes.Default.ReturnCode = 0
test_run.Processes.Default.Streams.stdout = "gold/httpbin_2_stdout.gold"
-test_run.Processes.Default.Streams.stderr = "gold/httpbin_2_stderr.gold"
+# Different versions of curl will have
[trafficserver] branch 9.1.x updated: Updated ChangeLog
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 0b207cd Updated ChangeLog 0b207cd is described below commit 0b207cd44172ada562559cfb759110df0e7558a6 Author: Leif Hedstrom AuthorDate: Wed Apr 7 09:08:58 2021 -0600 Updated ChangeLog --- CHANGELOG-9.1.0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG-9.1.0 b/CHANGELOG-9.1.0 index 67198c4..00033e1 100644 --- a/CHANGELOG-9.1.0 +++ b/CHANGELOG-9.1.0 @@ -270,7 +270,6 @@ Changes with Apache Traffic Server 9.1.0 #7464 - Upgrade Catch.hpp to v2.13.4 #7465 - Select lua context per thread #7466 - Change atoi to atol, causing obvious issues on what needs to be int64's - #7469 - Update AuTest version update directions for pipenv #7473 - Adjust so transfer-encoding header can be treated hop-by-hop #7488 - Avoid -Warray-bounds on PROXY Protocol Builder #7491 - Add new log field for negotiated ALPN Protocol ID with the client @@ -281,6 +280,7 @@ Changes with Apache Traffic Server 9.1.0 #7500 - Disable ja3 plugin when building with boringssl #7502 - traffic_dump: AuTests to use Proxy Verifier. #7511 - Add ALPN support on TLS Partial Blind Tunnel + #7516 - Adding TCP Info header support to header rewrite #7518 - Updates the Dockerfile for debian #7522 - Make the H3 build script work properly on Debian platforms #7532 - Fix asserts in multiplexer plugin. @@ -295,6 +295,7 @@ Changes with Apache Traffic Server 9.1.0 #7572 - FQ pacing plugin memory leak fix #7589 - Add gold test for remap config .include directive. #7608 - Set pcre_malloc/free function pointers in core main() only. + #7619 - Use standard isdigit library function #7625 - Add proxy.process.http.background_fill_total_count #7626 - Remove unused variables #7627 - Add pooled_server_connections metric
[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 2ff3d0c Updated ChangeLog 2ff3d0c is described below commit 2ff3d0c3d7e7f80f19c0f8129d0f0e79755fe0da Author: Leif Hedstrom AuthorDate: Wed Apr 7 09:07:50 2021 -0600 Updated ChangeLog --- CHANGELOG-9.0.1 | 5 + 1 file changed, 5 insertions(+) diff --git a/CHANGELOG-9.0.1 b/CHANGELOG-9.0.1 index 3fcbae1..36212fb 100644 --- a/CHANGELOG-9.0.1 +++ b/CHANGELOG-9.0.1 @@ -32,6 +32,7 @@ Changes with Apache Traffic Server 9.0.1 #7460 - Update to the new MicroServer 1.0.6 release #7463 - Fixing compress expectation for new microserver #7468 - Proxy Verifier: Making use of delay directives for caching tests. + #7469 - Update AuTest version update directions for pipenv #7483 - Fix KA header not checking strategy #7484 - traffic_ctl - Fix lookup key for run-root option. #7486 - slice/server: handleFirstServerHeader exit sooner on detected requested range errors. @@ -57,6 +58,10 @@ Changes with Apache Traffic Server 9.0.1 #7620 - Adding negative revalidating AuTests. #7621 - Update server_response_body_bytes when background fill worked #7634 - statichit: misc. fixes + #7641 - Do NOT kill tunnel if it has any consumer besides HT_HTTP_CLIENT #7646 - Remove erroneous manager.log mesg with remap include file reload #7665 - AuTest: New log and When condition for ATS initialized #7672 - Add information about TSHttpArgIndexReserve name change to upgrade notes + #7682 - Updating to AuTest 1.10.0 + #7683 - Make HTTP/2 Curl AuTest gold files case insensitive + #7685 - Fix has_consumer_besides_client to deal with no clients
[trafficserver] branch 9.0.x updated: Fix has_consumer_besides_client to deal with no clients (#7685)
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 748a7e0 Fix has_consumer_besides_client to deal with no clients
(#7685)
748a7e0 is described below
commit 748a7e062d1a743011cdc6020ff842da04a9ce91
Author: Susan Hinrichs
AuthorDate: Tue Apr 6 08:41:12 2021 -0500
Fix has_consumer_besides_client to deal with no clients (#7685)
(cherry picked from commit 09e72839258a4f748aace4908c996e843e6d5176)
---
proxy/http/HttpTunnel.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/proxy/http/HttpTunnel.h b/proxy/http/HttpTunnel.h
index 7774e2c..73842b1 100644
--- a/proxy/http/HttpTunnel.h
+++ b/proxy/http/HttpTunnel.h
@@ -521,7 +521,7 @@ HttpTunnel::has_cache_writer() const
inline bool
HttpTunnel::has_consumer_besides_client() const
{
- bool res = true;
+ bool res = false; // case of no consumers
for (const auto : consumers) {
if (!consumer.alive) {
[trafficserver] 01/02: Update AuTest version update directions for pipenv (#7469)
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 ae5d8225168094b515c178ef95af1a10ecc974b0
Author: Brian Neradt
AuthorDate: Tue Feb 2 13:22:11 2021 -0600
Update AuTest version update directions for pipenv (#7469)
The current AuTest extension describes how to update AuTest for pip,
not the currently used pipenv environment. This updates those directions
for pipenv.
This also adds a version check for microserver analogous to the version
check for AuTest.
(cherry picked from commit 941b923579c32b4694bf384cbd91d02be596a69e)
---
tests/Pipfile | 6 ++
tests/gold_tests/autest-site/init.cli.ext | 20 ++--
2 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/tests/Pipfile b/tests/Pipfile
index 727ea1e..a41b53b 100644
--- a/tests/Pipfile
+++ b/tests/Pipfile
@@ -24,7 +24,10 @@ autopep8 = "*"
pyflakes = "*"
[packages]
+
+# Keep init.cli.ext updated with this required autest version.
autest = "==1.8.1"
+
traffic-replay = "*" # this should install TRLib, MicroServer, MicroDNS,
Traffic-Replay
hyper = "*"
dnslib = "*"
@@ -32,7 +35,10 @@ dnslib = "*"
requests = "*"
gunicorn = "*"
httpbin = "*"
+
+# Keep init.cli.ext updated with this required microserver version.
microserver = ">=1.0.6"
+
jsonschema = "*"
python-jose = "*"
diff --git a/tests/gold_tests/autest-site/init.cli.ext
b/tests/gold_tests/autest-site/init.cli.ext
index 77678f1..505d63e 100644
--- a/tests/gold_tests/autest-site/init.cli.ext
+++ b/tests/gold_tests/autest-site/init.cli.ext
@@ -17,21 +17,29 @@
# limitations under the License.
import sys
+import microserver
if sys.version_info < (3, 6, 0):
host.WriteError(
"You need python 3.6 or later to run these tests\n", show_stack=False)
-autest_version = "1.8.1"
-if AuTestVersion() < autest_version:
+needed_autest_version = "1.8.1"
+found_autest_version = AuTestVersion()
+if AuTestVersion() < needed_autest_version:
host.WriteError(
-"Tests need AuTest version {needed_version} or better, found version
{found_version}\n"
-"Please update AuTest:\n pip install --upgrade autest\n".format(
-needed_version=autest_version,
-found_version=AuTestVersion()),
+f"Tests need AuTest version {needed_autest_version} or better, found
version {found_autest_version}\n"
+"Please update AuTest:\n pipenv --rm && pipenv install\n",
show_stack=False)
+needed_microserver_version = "1.0.6"
+found_microserver_version = microserver.__version__
+if found_microserver_version < needed_microserver_version:
+host.WriteError(
+f"Tests need a MicroServer version {needed_microserver_version} or
better, found version {found_microserver_version}\n"
+"Please update MicroServer:\n pipenv --rm && pipenv install\n",
+show_stack=False)
+
Settings.path_argument(["--ats-bin"],
required=True,
help="A user provided directory to ATS bin")
[trafficserver] branch 9.0.x updated (373b1e1 -> 61677f2)
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 373b1e1 Make HTTP/2 Curl AuTest gold files case insensitive (#7683) new ae5d822 Update AuTest version update directions for pipenv (#7469) new 61677f2 Updating to AuTest 1.10.0 (#7682) 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: tests/Pipfile | 8 +++- tests/gold_tests/autest-site/init.cli.ext | 20 ++-- 2 files changed, 21 insertions(+), 7 deletions(-)
[trafficserver] 02/02: Updating to AuTest 1.10.0 (#7682)
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 61677f261d1c1170ccdff473dedeeb431745f0fc Author: Brian Neradt AuthorDate: Mon Apr 5 17:08:47 2021 -0500 Updating to AuTest 1.10.0 (#7682) This new release supports case-insensitive gold files. We intend to use this for HTTP/2 curl AuTest gold files which, depending upon the version of curl, may or may not lowercase field names. (cherry picked from commit 4c882701eac237614aea24485da4233a7aed99ce) --- tests/Pipfile | 2 +- tests/gold_tests/autest-site/init.cli.ext | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Pipfile b/tests/Pipfile index a41b53b..321872e 100644 --- a/tests/Pipfile +++ b/tests/Pipfile @@ -26,7 +26,7 @@ pyflakes = "*" [packages] # Keep init.cli.ext updated with this required autest version. -autest = "==1.8.1" +autest = "==1.10.0" traffic-replay = "*" # this should install TRLib, MicroServer, MicroDNS, Traffic-Replay hyper = "*" diff --git a/tests/gold_tests/autest-site/init.cli.ext b/tests/gold_tests/autest-site/init.cli.ext index 505d63e..cf48e0d 100644 --- a/tests/gold_tests/autest-site/init.cli.ext +++ b/tests/gold_tests/autest-site/init.cli.ext @@ -23,7 +23,7 @@ if sys.version_info < (3, 6, 0): host.WriteError( "You need python 3.6 or later to run these tests\n", show_stack=False) -needed_autest_version = "1.8.1" +needed_autest_version = "1.10.0" found_autest_version = AuTestVersion() if AuTestVersion() < needed_autest_version: host.WriteError(
[trafficserver] branch 9.1.x updated: Updating to AuTest 1.10.0 (#7682)
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 c773d3a Updating to AuTest 1.10.0 (#7682) c773d3a is described below commit c773d3a75e6883d456572700c919fdd1ebf7f9fe Author: Brian Neradt AuthorDate: Mon Apr 5 17:08:47 2021 -0500 Updating to AuTest 1.10.0 (#7682) This new release supports case-insensitive gold files. We intend to use this for HTTP/2 curl AuTest gold files which, depending upon the version of curl, may or may not lowercase field names. (cherry picked from commit 4c882701eac237614aea24485da4233a7aed99ce) --- tests/Pipfile | 2 +- tests/gold_tests/autest-site/init.cli.ext | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Pipfile b/tests/Pipfile index a41b53b..321872e 100644 --- a/tests/Pipfile +++ b/tests/Pipfile @@ -26,7 +26,7 @@ pyflakes = "*" [packages] # Keep init.cli.ext updated with this required autest version. -autest = "==1.8.1" +autest = "==1.10.0" traffic-replay = "*" # this should install TRLib, MicroServer, MicroDNS, Traffic-Replay hyper = "*" diff --git a/tests/gold_tests/autest-site/init.cli.ext b/tests/gold_tests/autest-site/init.cli.ext index 505d63e..cf48e0d 100644 --- a/tests/gold_tests/autest-site/init.cli.ext +++ b/tests/gold_tests/autest-site/init.cli.ext @@ -23,7 +23,7 @@ if sys.version_info < (3, 6, 0): host.WriteError( "You need python 3.6 or later to run these tests\n", show_stack=False) -needed_autest_version = "1.8.1" +needed_autest_version = "1.10.0" found_autest_version = AuTestVersion() if AuTestVersion() < needed_autest_version: host.WriteError(
[trafficserver] branch 9.1.x updated: Fix has_consumer_besides_client to deal with no clients (#7685)
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 366b71d Fix has_consumer_besides_client to deal with no clients
(#7685)
366b71d is described below
commit 366b71db8246e4a9fa96bebf22a27b6622a5d573
Author: Susan Hinrichs
AuthorDate: Tue Apr 6 08:41:12 2021 -0500
Fix has_consumer_besides_client to deal with no clients (#7685)
(cherry picked from commit 09e72839258a4f748aace4908c996e843e6d5176)
---
proxy/http/HttpTunnel.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/proxy/http/HttpTunnel.h b/proxy/http/HttpTunnel.h
index 7774e2c..73842b1 100644
--- a/proxy/http/HttpTunnel.h
+++ b/proxy/http/HttpTunnel.h
@@ -521,7 +521,7 @@ HttpTunnel::has_cache_writer() const
inline bool
HttpTunnel::has_consumer_besides_client() const
{
- bool res = true;
+ bool res = false; // case of no consumers
for (const auto : consumers) {
if (!consumer.alive) {
[trafficserver] branch 9.1.x updated: Make HTTP/2 Curl AuTest gold files case insensitive (#7683)
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 768fc8a Make HTTP/2 Curl AuTest gold files case insensitive (#7683)
768fc8a is described below
commit 768fc8a5e5a2d94d4c90811d2d533dfa13da6008
Author: Brian Neradt
AuthorDate: Wed Apr 7 09:47:05 2021 -0500
Make HTTP/2 Curl AuTest gold files case insensitive (#7683)
Newer versions of Curl (7.67.0) lowercase HTTP/2 field names in
compliance with the HTTP/2 spec. Since some devs will have newer and
some older versions of Curl, this accommodates both by making the HTTP/2
gold files for AuTests match case-insensitively.
(cherry picked from commit a8b6746d303c4fafdc2e609941750fc4c2ac9b14)
---
tests/gold_tests/h2/http2.test.py | 6 --
tests/gold_tests/h2/http2_priority.test.py | 3 ++-
tests/gold_tests/h2/httpbin.test.py| 12
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/tests/gold_tests/h2/http2.test.py
b/tests/gold_tests/h2/http2.test.py
index 304b52f..da9d738 100644
--- a/tests/gold_tests/h2/http2.test.py
+++ b/tests/gold_tests/h2/http2.test.py
@@ -208,7 +208,8 @@ tr = Test.AddTestRun()
tr.Processes.Default.Command = 'curl -vs -k --http2
https://127.0.0.1:{0}/huge_resp_hdrs'.format(ts.Variables.ssl_port)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/http2_8_stdout.gold"
-tr.Processes.Default.Streams.stderr = "gold/http2_8_stderr.gold"
+# Different versions of curl will have different cases for HTTP/2 field names.
+tr.Processes.Default.Streams.stderr =
Testers.GoldFile("gold/http2_8_stderr.gold", case_insensitive=True)
tr.StillRunningAfter = server
# Test Case 9: Header Only Response - e.g. 204
@@ -216,5 +217,6 @@ tr = Test.AddTestRun()
tr.Processes.Default.Command = 'curl -vs -k --http2
https://127.0.0.1:{0}/status/204'.format(ts.Variables.ssl_port)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/http2_9_stdout.gold"
-tr.Processes.Default.Streams.stderr = "gold/http2_9_stderr.gold"
+# Different versions of curl will have different cases for HTTP/2 field names.
+tr.Processes.Default.Streams.stderr =
Testers.GoldFile("gold/http2_9_stderr.gold", case_insensitive=True)
tr.StillRunningAfter = server
diff --git a/tests/gold_tests/h2/http2_priority.test.py
b/tests/gold_tests/h2/http2_priority.test.py
index 83bf797..086863b 100644
--- a/tests/gold_tests/h2/http2_priority.test.py
+++ b/tests/gold_tests/h2/http2_priority.test.py
@@ -76,5 +76,6 @@ tr.Processes.Default.TimeOut = 5
tr.Processes.Default.StartBefore(server,
ready=When.PortOpen(server.Variables.Port))
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.Processes.Default.Streams.stdout = "gold/priority_0_stdout.gold"
-tr.Processes.Default.Streams.stderr = "gold/priority_0_stderr.gold"
+# Different versions of curl will have different cases for HTTP/2 field names.
+tr.Processes.Default.Streams.stderr =
Testers.GoldFile("gold/priority_0_stderr.gold", case_insensitive=True)
tr.StillRunningAfter = server
diff --git a/tests/gold_tests/h2/httpbin.test.py
b/tests/gold_tests/h2/httpbin.test.py
index fe09729..fe37b27 100644
--- a/tests/gold_tests/h2/httpbin.test.py
+++ b/tests/gold_tests/h2/httpbin.test.py
@@ -93,7 +93,8 @@ test_run.Processes.Default.ReturnCode = 0
test_run.Processes.Default.StartBefore(httpbin,
ready=When.PortOpen(httpbin.Variables.Port))
test_run.Processes.Default.StartBefore(Test.Processes.ts)
test_run.Processes.Default.Streams.stdout = "gold/httpbin_0_stdout.gold"
-test_run.Processes.Default.Streams.stderr = "gold/httpbin_0_stderr.gold"
+# Different versions of curl will have different cases for HTTP/2 field names.
+test_run.Processes.Default.Streams.stderr =
Testers.GoldFile("gold/httpbin_0_stderr.gold", case_insensitive=True)
test_run.StillRunningAfter = httpbin
# Test Case 1: Empty response body
@@ -101,7 +102,8 @@ test_run = Test.AddTestRun()
test_run.Processes.Default.Command = 'curl -vs -k --http2
https://127.0.0.1:{0}/bytes/0'.format(ts.Variables.ssl_port)
test_run.Processes.Default.ReturnCode = 0
test_run.Processes.Default.Streams.stdout = "gold/httpbin_1_stdout.gold"
-test_run.Processes.Default.Streams.stderr = "gold/httpbin_1_stderr.gold"
+# Different versions of curl will have different cases for HTTP/2 field names.
+test_run.Processes.Default.Streams.stderr =
Testers.GoldFile("gold/httpbin_1_stderr.gold", case_insensitive=True)
test_run.StillRunningAfter = httpbin
# Test Case 2: Chunked
@@ -110,7 +112,8 @@ test_run.Processes.Default.Command = 'curl -vs -k --http2
https://127.0.0.1:{0}/
ts.Variables.ssl_port)
test_run.Processes.Default.ReturnCode = 0
test_run.Processes.Default.Streams.stdout = "gold/httpbin_2_stdout.gold"
-test_run.Processes.Default.Streams.stderr =
[trafficserver] branch 9.0.x updated (5ba803e -> 373b1e1)
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 5ba803e Updated ChangeLog new 0ceccad Do NOT kill tunnel if it has any consumer besides HT_HTTP_CLIENT (#7641) new 373b1e1 Make HTTP/2 Curl AuTest gold files case insensitive (#7683) 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/HttpSM.cc | 4 ++-- proxy/http/HttpTunnel.h| 26 ++ tests/gold_tests/h2/http2.test.py | 6 -- tests/gold_tests/h2/http2_priority.test.py | 3 ++- tests/gold_tests/h2/httpbin.test.py| 12 5 files changed, 42 insertions(+), 9 deletions(-)
[trafficserver] 02/02: Make HTTP/2 Curl AuTest gold files case insensitive (#7683)
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 373b1e117c79fbd12b857374547e51a3fec67abb
Author: Brian Neradt
AuthorDate: Wed Apr 7 09:47:05 2021 -0500
Make HTTP/2 Curl AuTest gold files case insensitive (#7683)
Newer versions of Curl (7.67.0) lowercase HTTP/2 field names in
compliance with the HTTP/2 spec. Since some devs will have newer and
some older versions of Curl, this accommodates both by making the HTTP/2
gold files for AuTests match case-insensitively.
(cherry picked from commit a8b6746d303c4fafdc2e609941750fc4c2ac9b14)
---
tests/gold_tests/h2/http2.test.py | 6 --
tests/gold_tests/h2/http2_priority.test.py | 3 ++-
tests/gold_tests/h2/httpbin.test.py| 12
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/tests/gold_tests/h2/http2.test.py
b/tests/gold_tests/h2/http2.test.py
index a1ff957..be77c61 100644
--- a/tests/gold_tests/h2/http2.test.py
+++ b/tests/gold_tests/h2/http2.test.py
@@ -208,7 +208,8 @@ tr = Test.AddTestRun()
tr.Processes.Default.Command = 'curl -vs -k --http2
https://127.0.0.1:{0}/huge_resp_hdrs'.format(ts.Variables.ssl_port)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/http2_8_stdout.gold"
-tr.Processes.Default.Streams.stderr = "gold/http2_8_stderr.gold"
+# Different versions of curl will have different cases for HTTP/2 field names.
+tr.Processes.Default.Streams.stderr =
Testers.GoldFile("gold/http2_8_stderr.gold", case_insensitive=True)
tr.StillRunningAfter = server
# Test Case 9: Header Only Response - e.g. 204
@@ -216,5 +217,6 @@ tr = Test.AddTestRun()
tr.Processes.Default.Command = 'curl -vs -k --http2
https://127.0.0.1:{0}/status/204'.format(ts.Variables.ssl_port)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/http2_9_stdout.gold"
-tr.Processes.Default.Streams.stderr = "gold/http2_9_stderr.gold"
+# Different versions of curl will have different cases for HTTP/2 field names.
+tr.Processes.Default.Streams.stderr =
Testers.GoldFile("gold/http2_9_stderr.gold", case_insensitive=True)
tr.StillRunningAfter = server
diff --git a/tests/gold_tests/h2/http2_priority.test.py
b/tests/gold_tests/h2/http2_priority.test.py
index ce22cbc..b6df98e 100644
--- a/tests/gold_tests/h2/http2_priority.test.py
+++ b/tests/gold_tests/h2/http2_priority.test.py
@@ -77,5 +77,6 @@ tr.Processes.Default.TimeOut = 5
tr.Processes.Default.StartBefore(server,
ready=When.PortOpen(server.Variables.Port))
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.Processes.Default.Streams.stdout = "gold/priority_0_stdout.gold"
-tr.Processes.Default.Streams.stderr = "gold/priority_0_stderr.gold"
+# Different versions of curl will have different cases for HTTP/2 field names.
+tr.Processes.Default.Streams.stderr =
Testers.GoldFile("gold/priority_0_stderr.gold", case_insensitive=True)
tr.StillRunningAfter = server
diff --git a/tests/gold_tests/h2/httpbin.test.py
b/tests/gold_tests/h2/httpbin.test.py
index 453e4b4..87bbfae 100644
--- a/tests/gold_tests/h2/httpbin.test.py
+++ b/tests/gold_tests/h2/httpbin.test.py
@@ -94,7 +94,8 @@ test_run.Processes.Default.ReturnCode = 0
test_run.Processes.Default.StartBefore(httpbin,
ready=When.PortOpen(httpbin.Variables.Port))
test_run.Processes.Default.StartBefore(Test.Processes.ts)
test_run.Processes.Default.Streams.stdout = "gold/httpbin_0_stdout.gold"
-test_run.Processes.Default.Streams.stderr = "gold/httpbin_0_stderr.gold"
+# Different versions of curl will have different cases for HTTP/2 field names.
+test_run.Processes.Default.Streams.stderr =
Testers.GoldFile("gold/httpbin_0_stderr.gold", case_insensitive=True)
test_run.StillRunningAfter = httpbin
# Test Case 1: Empty response body
@@ -102,7 +103,8 @@ test_run = Test.AddTestRun()
test_run.Processes.Default.Command = 'curl -vs -k --http2
https://127.0.0.1:{0}/bytes/0'.format(ts.Variables.ssl_port)
test_run.Processes.Default.ReturnCode = 0
test_run.Processes.Default.Streams.stdout = "gold/httpbin_1_stdout.gold"
-test_run.Processes.Default.Streams.stderr = "gold/httpbin_1_stderr.gold"
+# Different versions of curl will have different cases for HTTP/2 field names.
+test_run.Processes.Default.Streams.stderr =
Testers.GoldFile("gold/httpbin_1_stderr.gold", case_insensitive=True)
test_run.StillRunningAfter = httpbin
# Test Case 2: Chunked
@@ -111,7 +113,8 @@ test_run.Processes.Default.Command = 'curl -vs -k --http2
https://127.0.0.1:{0}/
ts.Variables.ssl_port)
test_run.Processes.Default.ReturnCode = 0
test_run.Processes.Default.Streams.stdout = "gold/httpbin_2_stdout.gold"
-test_run.Processes.Default.Streams.stderr = "gold/httpbin_2_stderr.gold"
+# Different versions of curl will have different cases for HTTP/2 field names.
+test_run.Processes.Default.Streams.stderr =
[trafficserver] 01/02: Do NOT kill tunnel if it has any consumer besides HT_HTTP_CLIENT (#7641)
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 0ceccad534b34af1694627689725541268ef304f
Author: Masaori Koshiba
AuthorDate: Fri Apr 2 07:56:13 2021 +0900
Do NOT kill tunnel if it has any consumer besides HT_HTTP_CLIENT (#7641)
(cherry picked from commit 270ca6e84eba758e44c9b2a15046eaa7b8af8d8a)
---
proxy/http/HttpSM.cc| 4 ++--
proxy/http/HttpTunnel.h | 26 ++
2 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/proxy/http/HttpSM.cc b/proxy/http/HttpSM.cc
index aa88ede..1fa9ef7 100644
--- a/proxy/http/HttpSM.cc
+++ b/proxy/http/HttpSM.cc
@@ -901,9 +901,9 @@ HttpSM::state_watch_for_client_abort(int event, void *data)
* client.
*/
case VC_EVENT_EOS: {
-// We got an early EOS.
+// We got an early EOS. If the tunnal has cache writer, don't kill it for
background fill.
NetVConnection *netvc = ua_txn->get_netvc();
-if (ua_txn->allow_half_open()) {
+if (ua_txn->allow_half_open() || tunnel.has_consumer_besides_client()) {
if (netvc) {
netvc->do_io_shutdown(IO_SHUTDOWN_READ);
}
diff --git a/proxy/http/HttpTunnel.h b/proxy/http/HttpTunnel.h
index c6aa9fc..7774e2c 100644
--- a/proxy/http/HttpTunnel.h
+++ b/proxy/http/HttpTunnel.h
@@ -282,6 +282,7 @@ public:
}
bool is_tunnel_alive() const;
bool has_cache_writer() const;
+ bool has_consumer_besides_client() const;
HttpTunnelProducer *add_producer(VConnection *vc, int64_t nbytes,
IOBufferReader *reader_start, HttpProducerHandler sm_handler,
HttpTunnelType_t vc_type, const char *name);
@@ -514,6 +515,31 @@ HttpTunnel::has_cache_writer() const
return false;
}
+/**
+ Return false if there is only a consumer for client
+ */
+inline bool
+HttpTunnel::has_consumer_besides_client() const
+{
+ bool res = true;
+
+ for (const auto : consumers) {
+if (!consumer.alive) {
+ continue;
+}
+
+if (consumer.vc_type == HT_HTTP_CLIENT) {
+ res = false;
+ continue;
+} else {
+ res = true;
+ break;
+}
+ }
+
+ return res;
+}
+
inline bool
HttpTunnelConsumer::is_downstream_from(VConnection *vc)
{
[trafficserver] branch master updated (9817675 -> a8b6746)
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 9817675 Add STL compliant field iteration to MIMEHdr. - rebase. (#7476) add a8b6746 Make HTTP/2 Curl AuTest gold files case insensitive (#7683) No new revisions were added by this update. Summary of changes: tests/gold_tests/h2/http2.test.py | 6 -- tests/gold_tests/h2/http2_priority.test.py | 3 ++- tests/gold_tests/h2/httpbin.test.py| 12 3 files changed, 14 insertions(+), 7 deletions(-)
[trafficserver] branch master updated (b05c5be -> 9817675)
This is an automated email from the ASF dual-hosted git repository. amc pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git. from b05c5be Fix use of -mcx16 flag - only use if it compiles cleanly. (#7684) add 9817675 Add STL compliant field iteration to MIMEHdr. - rebase. (#7476) No new revisions were added by this update. Summary of changes: proxy/hdrs/MIME.h | 140 +++--- proxy/http/HttpTransact.cc| 28 ++ proxy/http/HttpTransactHeaders.cc | 12 ++- proxy/http2/HPACK.cc | 7 +- proxy/http2/HTTP2.cc | 9 +- proxy/http2/test_HPACK.cc | 21 ++--- proxy/http3/QPACK.cc | 5 +- proxy/logging/LogUtils.cc | 11 +-- proxy/logging/unit-tests/test_LogUtils.cc | 2 - proxy/logging/unit-tests/test_LogUtils.h | 33 +++ 10 files changed, 152 insertions(+), 116 deletions(-)
[trafficserver] branch master updated (23c0f1a -> b05c5be)
This is an automated email from the ASF dual-hosted git repository. amc pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/trafficserver.git. from 23c0f1a Refine connection failure logging and messages and eliminate suprious connection errors (#7580) add b05c5be Fix use of -mcx16 flag - only use if it compiles cleanly. (#7684) No new revisions were added by this update. Summary of changes: configure.ac | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-)
