This is an automated email from the ASF dual-hosted git repository.
bneradt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new ad0ce02abf curl 8.20 test update: curl PROXY destination changes
(#13239)
ad0ce02abf is described below
commit ad0ce02abf550455896167fa79ca1224f939cf1c
Author: Brian Neradt <[email protected]>
AuthorDate: Thu Jun 4 15:40:15 2026 -0500
curl 8.20 test update: curl PROXY destination changes (#13239)
curl 8.20 intentionally mirrors --haproxy-clientip into both PROXY
addresses to keep the header address family consistent. The
TSVConnPPInfo AuTest still expected the older destination address, so
jobs with newer curl failed even though ATS preserved the PROXY metadata
it received.
This relaxes the destination-address expectation to accept either curl
behavior while continuing to verify the source address and PROXY
metadata. This also wraps the long curl command strings while leaving
the test's request flow unchanged.
---
.../gold_tests/pluginTest/tsapi/test_TSVConnPPInfo.test.py | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/tests/gold_tests/pluginTest/tsapi/test_TSVConnPPInfo.test.py
b/tests/gold_tests/pluginTest/tsapi/test_TSVConnPPInfo.test.py
index 3adea661f3..a70a103cad 100644
--- a/tests/gold_tests/pluginTest/tsapi/test_TSVConnPPInfo.test.py
+++ b/tests/gold_tests/pluginTest/tsapi/test_TSVConnPPInfo.test.py
@@ -79,7 +79,9 @@ Test.Env["OUTPUT_FILE"] = log_path
# plaintext HTTP
tr = Test.AddTestRun()
tr.TimeOut = 10
-tr.Processes.Default.Command = f"curl --haproxy-protocol --haproxy-clientip
1.2.3.4 'http://127.0.0.1:{ts.Variables.proxy_protocol_port}/httpbin/get'"
+tr.Processes.Default.Command = (
+ f"curl --haproxy-protocol --haproxy-clientip 1.2.3.4 "
+ f"'http://127.0.0.1:{ts.Variables.proxy_protocol_port}/httpbin/get'")
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(httpbin)
tr.Processes.Default.StartBefore(Test.Processes.ts)
@@ -90,7 +92,9 @@ tr.StillRunningAfter = ts
# HTTPS
tr = Test.AddTestRun()
tr.TimeOut = 10
-tr.Processes.Default.Command = f"curl --haproxy-protocol --haproxy-clientip
5.6.7.8 -k
'https://127.0.0.1:{ts.Variables.proxy_protocol_ssl_port}/httpbin/get'"
+tr.Processes.Default.Command = (
+ f"curl --haproxy-protocol --haproxy-clientip 5.6.7.8 -k "
+ f"'https://127.0.0.1:{ts.Variables.proxy_protocol_ssl_port}/httpbin/get'")
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "test_TSVConnPPInfo_curl1.gold"
tr.StillRunningAfter = httpbin
@@ -101,7 +105,8 @@ tr.Processes.Default.Command = "echo check log"
tr.Processes.Default.ReturnCode = 0
f = tr.Disk.File(log_path)
f.Content = "test_TSVConnPPInfo_plugin_log.gold"
+# curl 8.20+ intentionally uses --haproxy-clientip for both PROXY addresses so
the address family matches.
f.Content += Testers.ContainsExpression(
- "PP Info Received:V1,P2,T1,SRC1.2.3.4,DST127.0.0.1", "Expected information
should be received")
+ r"PP Info Received:V1,P2,T1,SRC1\.2\.3\.4,DST(127\.0\.0\.1|1\.2\.3\.4)",
"Expected information should be received")
f.Content += Testers.ContainsExpression(
- "PP Info Received:V1,P2,T1,SRC5.6.7.8,DST127.0.0.1", "Expected information
should be received")
+ r"PP Info Received:V1,P2,T1,SRC5\.6\.7\.8,DST(127\.0\.0\.1|5\.6\.7\.8)",
"Expected information should be received")
