diff --git a/CMakeLists.txt b/CMakeLists.txt index b9c0e053986..0019aabda86 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -665,8 +665,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 df882262002..9299ed849ea 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 729bf82aa96..3e853a30f1b 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 9f94b801a39..ad55eb85fc4 100644 --- a/tests/proxy-verifier-version.txt +++ b/tests/proxy-verifier-version.txt @@ -1 +1 @@ -v2.12.0 +v3.0.0