This is an automated email from the ASF dual-hosted git repository.
ezelkow1 pushed a commit to branch 9.2.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/9.2.x by this push:
new 056a39fb8c Prepare for 9.2.14 and commit yapf fixes
056a39fb8c is described below
commit 056a39fb8c468a89a98be004ad6ae28b3d435c08
Author: ezelkow1 <[email protected]>
AuthorDate: Wed Jul 15 10:44:29 2026 -0600
Prepare for 9.2.14 and commit yapf fixes
---
CHANGELOG-9.2.14 | 5 +++++
configure.ac | 4 ++--
tests/gold_tests/autest-site/trafficserver.test.ext | 3 ++-
.../gold_tests/redirect/number_of_redirects.test.py | 3 +--
tests/gold_tests/remap/remap_acl.test.py | 21 ++++++++++++++-------
tests/gold_tests/tls/test-0rtt-s_client.py | 1 -
tests/gold_tests/tls/tls_tunnel.test.py | 4 +++-
tools/package/trafficserver.spec | 2 +-
8 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/CHANGELOG-9.2.14 b/CHANGELOG-9.2.14
new file mode 100644
index 0000000000..6decd22dd3
--- /dev/null
+++ b/CHANGELOG-9.2.14
@@ -0,0 +1,5 @@
+Changes with Apache Traffic Server 9.2.14
+ #12910 - Fix connection-level window mismatch causing 408/504 timeouts
+ #13266 - Add Claude Code project guide for the 9.2.x branch
+ #13267 - [9.2.x] Backport format scripts fixes
+ #13377 - 9.2.x: http2: Track scheduled events
diff --git a/configure.ac b/configure.ac
index 05d6bad496..7069b0be2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,8 +32,8 @@
# Version number is calculated as MAJOR * 1000000 + MINOR * 1000 + MICRO
# Version string is in the form of MAJOR.MINOR.MICRO[sufix]
#
-m4_define([TS_VERSION_S],[9.2.13])
-m4_define([TS_VERSION_N],[9002013])
+m4_define([TS_VERSION_S],[9.2.14])
+m4_define([TS_VERSION_N],[9002014])
AC_INIT([Apache Traffic
Server],[TS_VERSION_S()],[[email protected]],[trafficserver],[https://trafficserver.apache.org])
AC_PREREQ([2.69])
diff --git a/tests/gold_tests/autest-site/trafficserver.test.ext
b/tests/gold_tests/autest-site/trafficserver.test.ext
index 6979523508..7429607504 100755
--- a/tests/gold_tests/autest-site/trafficserver.test.ext
+++ b/tests/gold_tests/autest-site/trafficserver.test.ext
@@ -44,7 +44,8 @@ def MakeATSProcess(
enable_quic=False,
block_for_debug=False,
log_data=default_log_data,
- use_traffic_out=True, enable_proxy_protocol=False):
+ use_traffic_out=True,
+ enable_proxy_protocol=False):
#####################################
# common locations
diff --git a/tests/gold_tests/redirect/number_of_redirects.test.py
b/tests/gold_tests/redirect/number_of_redirects.test.py
index 1793ae0c6d..ea25250dc3 100644
--- a/tests/gold_tests/redirect/number_of_redirects.test.py
+++ b/tests/gold_tests/redirect/number_of_redirects.test.py
@@ -83,8 +83,7 @@ class NumberOfRedirectionsTest:
self._tr.Processes.Default.StartBefore(self._srv3)
self._tr.Processes.Default.StartBefore(self._dns)
self._tr.Processes.Default.StartBefore(self._ts)
- self._tr.Command = "curl -L -v a.test/ping --proxy 127.0.0.1:{0} -H
'uuid: redirect_test_1'".format(
- self._ts.Variables.port)
+ self._tr.Command = "curl -L -v a.test/ping --proxy 127.0.0.1:{0} -H
'uuid: redirect_test_1'".format(self._ts.Variables.port)
self._tr.Processes.Default.Streams.All =
f"gold/number_of_redirections_{self._numberOfRedirections}.gold"
self._tr.ReturnCode = 0
self._tr.StillRunningAfter = self._ts
diff --git a/tests/gold_tests/remap/remap_acl.test.py
b/tests/gold_tests/remap/remap_acl.test.py
index 08c913cba2..5be47e49e5 100644
--- a/tests/gold_tests/remap/remap_acl.test.py
+++ b/tests/gold_tests/remap/remap_acl.test.py
@@ -42,8 +42,8 @@ class Test_remap_acl:
_client_counter: int = 0
def __init__(
- self, name: str, replay_file: str, ip_allow_content: str,
deactivate_ip_allow: bool,
- acl_configuration: str, named_acls: List[Tuple[str, str]],
expected_responses: List[int], proxy_protocol: bool):
+ self, name: str, replay_file: str, ip_allow_content: str,
deactivate_ip_allow: bool, acl_configuration: str,
+ named_acls: List[Tuple[str, str]], expected_responses: List[int],
proxy_protocol: bool):
"""Initialize the test.
:param name: The name of the test.
@@ -138,6 +138,7 @@ class Test_remap_acl:
p.Streams.stdout += Testers.ContainsExpression(
'.*'.join(codes), "Verifying the expected order of responses",
reflags=re.DOTALL | re.MULTILINE)
+
def replay_proxy_response(filename, replay_file, get_proxy_response,
post_proxy_response):
"""
replay_proxy_response writes the given replay file (which expects a single
GET & POST client-request)
@@ -161,6 +162,7 @@ def replay_proxy_response(filename, replay_file,
get_proxy_response, post_proxy_
with open(replay_file, "w") as f:
f.write(dump(data))
+
IP_ALLOW_CONTENT = f'''
ip_allow:
- apply: in
@@ -179,7 +181,6 @@ test_ip_allow_optional_methods_pp = Test_remap_acl(
named_acls=[],
expected_responses=[200, 200, 403, 403, 403],
proxy_protocol=True)
-
"""
Test all acl combinations
# """
@@ -192,7 +193,11 @@ for idx, test in enumerate(all_acl_combination_tests):
test["POST response"],
)
Test_remap_acl(
- "{0} {1} {2}".format(test["inline"], test["named_acl"],
test["ip_allow"],),
+ "{0} {1} {2}".format(
+ test["inline"],
+ test["named_acl"],
+ test["ip_allow"],
+ ),
replay_file=replay_file_name,
ip_allow_content=test["ip_allow"],
deactivate_ip_allow=False,
@@ -201,7 +206,6 @@ for idx, test in enumerate(all_acl_combination_tests):
expected_responses=[test["GET response"], test["POST response"]],
proxy_protocol=False,
)
-
"""
Test all ACL combinations - deactivate ip_allow
"""
@@ -227,7 +231,6 @@ for idx, test in enumerate(all_deactivate_ip_allow_tests):
expected_responses=[test["GET response"], test["POST response"]],
proxy_protocol=False,
)
-
"""
Test combination of named filters
"""
@@ -240,7 +243,11 @@ for idx, test in enumerate(named_filter_combination_tests):
test["POST response"],
)
Test_remap_acl(
- "{0} {1} {2}".format(test["named_acl_1"], test["named_acl_2"],
test["ip_allow"],),
+ "{0} {1} {2}".format(
+ test["named_acl_1"],
+ test["named_acl_2"],
+ test["ip_allow"],
+ ),
replay_file=replay_file_name,
ip_allow_content=test["ip_allow"],
deactivate_ip_allow=False,
diff --git a/tests/gold_tests/tls/test-0rtt-s_client.py
b/tests/gold_tests/tls/test-0rtt-s_client.py
index 827e310610..c50de5bdff 100644
--- a/tests/gold_tests/tls/test-0rtt-s_client.py
+++ b/tests/gold_tests/tls/test-0rtt-s_client.py
@@ -86,7 +86,6 @@ def main():
else:
print(output.decode('utf-8'))
-
exit(0)
diff --git a/tests/gold_tests/tls/tls_tunnel.test.py
b/tests/gold_tests/tls/tls_tunnel.test.py
index 440e76bc45..de3e69c0b6 100644
--- a/tests/gold_tests/tls/tls_tunnel.test.py
+++ b/tests/gold_tests/tls/tls_tunnel.test.py
@@ -68,7 +68,9 @@ ts.Disk.records_config.update(
'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir),
'proxy.config.ssl.server.private_key.path':
'{0}'.format(ts.Variables.SSLDir),
'proxy.config.http.connect_ports':
- '{0} {1} {2} {3}'.format(ts.Variables.ssl_port,
server_foo.Variables.SSL_Port, server_bar.Variables.SSL_Port,
split_client_hello_server.Variables.tcp_port),
+ '{0} {1} {2} {3}'.format(
+ ts.Variables.ssl_port, server_foo.Variables.SSL_Port,
server_bar.Variables.SSL_Port,
+ split_client_hello_server.Variables.tcp_port),
'proxy.config.ssl.client.CA.cert.path':
'{0}'.format(ts.Variables.SSLDir),
'proxy.config.ssl.client.CA.cert.filename': 'signer.pem',
'proxy.config.exec_thread.autoconfig.scale': 1.0,
diff --git a/tools/package/trafficserver.spec b/tools/package/trafficserver.spec
index f8663d8171..71624c77fa 100755
--- a/tools/package/trafficserver.spec
+++ b/tools/package/trafficserver.spec
@@ -26,7 +26,7 @@
Summary: Apache Traffic Server, a reverse, forward and transparent HTTP
proxy cache
Name: trafficserver
-Version: 9.2.13
+Version: 9.2.14
Release: %{release}%{?dist}
License: Apache Software License 2.0 (AL2)
Group: System Environment/Daemons
