This is an automated email from the ASF dual-hosted git repository.

cmcfarlen pushed a commit to branch 10.2.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/10.2.x by this push:
     new 735eb5ea64 Update to Proxy Verifier v3.0.0 (#12990)
735eb5ea64 is described below

commit 735eb5ea64c92c3bee54011727f2ca430685bd44
Author: Brian Neradt <[email protected]>
AuthorDate: Thu Mar 19 09:58:33 2026 -0500

    Update to Proxy Verifier v3.0.0 (#12990)
    
    This updates our use of Proxy Verifier to version v3.0.0.
    
    This also requires updating cachedDuplicateHeaders.
    
    The latest proxy-verifier combines duplicate header values during
    equality checks unless the replay uses duplicate-aware
    verification. cachedDuplicateHeaders still expected the older
    rendering, so the AuTest failed even though ATS behavior had not
    changed.
    
    Update the replay expectation to match the current duplicate
    header matching behavior. This keeps the test validating cached
    header handling against the latest proxy-verifier semantics.
    
    (cherry picked from commit 886e36072f6e1a653ccb63c17be60a6153e88355)
---
 CMakeLists.txt                                          |  4 ++--
 tests/gold_tests/headers/replays/cache-test.replay.yaml | 16 ++++++++--------
 tests/prepare_proxy_verifier.sh                         |  2 +-
 tests/proxy-verifier-version.txt                        |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80aa25460c..2925e255fa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -674,8 +674,8 @@ if(ENABLE_AUTEST)
   # the autest command. The original AUTEST_OPTIONS string is used in the
   # autest.sh script.
   separate_arguments(AUTEST_OPTIONS_LIST UNIX_COMMAND "${AUTEST_OPTIONS}")
-  set(PROXY_VERIFIER_VERSION "v2.12.0")
-  set(PROXY_VERIFIER_HASH "SHA1=8e9adc6e0b31251ca8e6fc2064ae54e5d752bb72")
+  set(PROXY_VERIFIER_VERSION "v3.0.0")
+  set(PROXY_VERIFIER_HASH "SHA1=e11b5867a56c5ffd496b18c901f1273e9c120a47")
   include(proxy-verifier)
 endif()
 
diff --git a/tests/gold_tests/headers/replays/cache-test.replay.yaml 
b/tests/gold_tests/headers/replays/cache-test.replay.yaml
index df88226200..9299ed849e 100644
--- a/tests/gold_tests/headers/replays/cache-test.replay.yaml
+++ b/tests/gold_tests/headers/replays/cache-test.replay.yaml
@@ -55,14 +55,14 @@ sessions:
           headers:
             fields:
               - [Date, { value: "Mon, 23 Sep 2024 14:22:14 GMT", as: equal }]
-              - [X-Reveal-Duplicate, { value: same, as: equal }]
+              - [X-Reveal-Duplicate, { value: "same, same", as: equal }]
               - [Cache-Control, { value: "max-age=1, stale-if-error=1, 
stale-while-revalidate=1, public", as: equal }]
               - [Content-Length, { value: 3, as: equal }]
               - [Content-Type, { value: application/javascript, as: equal }]
               - [Expires, { value: "Mon, 23 Sep 2024 14:22:44 GMT", as: equal 
}]
               - [Last-Modified, { value: "Mon, 23 Sep 2024 14:22:14 GMT", as: 
equal }]
               - [X-Cache, { value: miss, as: equal }]
-              - [X-Reveal-Duplicate, { value: same, as: equal }]
+              - [X-Reveal-Duplicate, { value: "same, same", as: equal }]
 
       # Test 1: Cache hit stale with content-type after duplicate headers
       - client-request:
@@ -95,14 +95,14 @@ sessions:
           headers:
             fields:
               - [Date, { value: "Mon, 23 Sep 2024 14:22:14 GMT", as: equal }]
-              - [X-Reveal-Duplicate, { value: same, as: equal }]
+              - [X-Reveal-Duplicate, { value: "same, same", as: equal }]
               - [Cache-Control, { value: "max-age=1, stale-if-error=1, 
stale-while-revalidate=1, public", as: equal }]
               - [Content-Length, { value: 3, as: equal }]
               - [Content-Type, { value: application/javascript, as: equal }]
               - [Expires, { value: "Mon, 23 Sep 2024 14:22:44 GMT", as: equal 
}]
               - [Last-Modified, { value: "Mon, 23 Sep 2024 14:22:14 GMT", as: 
equal }]
               - [X-Cache, { value: hit-stale, as: equal }]
-              - [X-Reveal-Duplicate, { value: same, as: equal }]
+              - [X-Reveal-Duplicate, { value: "same, same", as: equal }]
 
       # Test 2: Cache fill with content-type before duplicate headers
       - client-request:
@@ -135,14 +135,14 @@ sessions:
           headers:
             fields:
               - [Date, { value: "Mon, 23 Sep 2024 14:22:14 GMT", as: equal }]
-              - [X-Reveal-Duplicate, { value: same, as: equal }]
+              - [X-Reveal-Duplicate, { value: "same, same", as: equal }]
               - [Cache-Control, { value: "max-age=1, stale-if-error=1, 
stale-while-revalidate=1, public", as: equal }]
               - [Content-Length, { value: 3, as: equal }]
               - [Content-Type, { value: application/javascript, as: equal }]
               - [Expires, { value: "Mon, 23 Sep 2024 14:22:44 GMT", as: equal 
}]
               - [Last-Modified, { value: "Mon, 23 Sep 2024 14:22:14 GMT", as: 
equal }]
               - [X-Cache, { value: miss, as: equal }]
-              - [X-Reveal-Duplicate, { value: same, as: equal }]
+              - [X-Reveal-Duplicate, { value: "same, same", as: equal }]
 
       # Test 3: Cache hit stale with content-type before duplicate headers
       - client-request:
@@ -175,8 +175,8 @@ sessions:
           headers:
             fields:
               - [Date, { value: "Mon, 23 Sep 2024 14:22:14 GMT", as: equal }]
-              - [X-Reveal-Duplicate, { value: same, as: equal }]
-              - [X-Reveal-Duplicate, { value: same, as: equal }]
+              - [X-Reveal-Duplicate, { value: "same, same", as: equal }]
+              - [X-Reveal-Duplicate, { value: "same, same", as: equal }]
               - [Cache-Control, { value: "max-age=1, stale-if-error=1, 
stale-while-revalidate=1, public", as: equal }]
               - [Content-Length, { value: 3, as: equal }]
               - [Content-Type, { value: application/javascript, as: equal }]
diff --git a/tests/prepare_proxy_verifier.sh b/tests/prepare_proxy_verifier.sh
index 729bf82aa9..3e853a30f1 100755
--- a/tests/prepare_proxy_verifier.sh
+++ b/tests/prepare_proxy_verifier.sh
@@ -40,7 +40,7 @@ pv_dir="${pv_name}-${pv_version}"
 pv_tar_filename="${pv_dir}.tar.gz"
 pv_tar="${pv_top_dir}/${pv_tar_filename}"
 pv_tar_url="https://ci.trafficserver.apache.org/bintray/${pv_tar_filename}";
-expected_sha1="8e9adc6e0b31251ca8e6fc2064ae54e5d752bb72"
+expected_sha1="e11b5867a56c5ffd496b18c901f1273e9c120a47"
 pv_client="${bin_dir}/verifier-client"
 pv_server="${bin_dir}/verifier-server"
 TAR=${TAR:-tar}
diff --git a/tests/proxy-verifier-version.txt b/tests/proxy-verifier-version.txt
index 9f94b801a3..ad55eb85fc 100644
--- a/tests/proxy-verifier-version.txt
+++ b/tests/proxy-verifier-version.txt
@@ -1 +1 @@
-v2.12.0
+v3.0.0

Reply via email to