From dce394a3033877c06f046ea8c3b594d76637953b Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Tue, 19 Nov 2024 07:59:21 +0100 Subject: [PATCH] REGTESTS: silence warnings about content-type being ignored The following rules are triggering warnings about content-type being ignored: http-request return content-type "text/plain" if { path /def-4 } http-request return content-type "text/plain" file /dev/null hdr "x-custom-hdr" "%[url]" if { path /empty-file } Annoyingly, the content-type is mandatory when the file is not empty, that might be something to revisit in the future to relax at least one of the rules so that the config doesn't strictly require to know the file contents upfront. --- reg-tests/http-rules/http_return.vtc | 4 ++-- reg-tests/sample_fetches/ubase64.vtc | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/reg-tests/http-rules/http_return.vtc b/reg-tests/http-rules/http_return.vtc index f292353cd..ea4e95672 100644 --- a/reg-tests/http-rules/http_return.vtc +++ b/reg-tests/http-rules/http_return.vtc @@ -22,11 +22,11 @@ haproxy h1 -conf { http-request return if { path /def-1 } http-request return hdr "x-custom-hdr" "%[url]" if { path /def-2 } http-request return status 403 if { path /def-3 } - http-request return content-type "text/plain" if { path /def-4 } + http-request return if { path /def-4 } http-request return content-type "text/plain" string "hello" hdr "x-custom-hdr" "%[url]" if { path /string } http-request return content-type "text/plain" lf-string "path is %[url]" hdr "x-custom-hdr" "%[url]" if { path /lf-string } - http-request return content-type "text/plain" file /dev/null hdr "x-custom-hdr" "%[url]" if { path /empty-file } + http-request return file /dev/null hdr "x-custom-hdr" "%[url]" if { path /empty-file } http-request return content-type "text/plain" file ${testdir}/1k.txt hdr "x-custom-hdr" "%[url]" if { path /file } http-request return content-type "text/plain" lf-file ${testdir}/lf-file.txt hdr "x-custom-hdr" "%[url]" if { path /lf-file } } -start diff --git a/reg-tests/sample_fetches/ubase64.vtc b/reg-tests/sample_fetches/ubase64.vtc index 8e47d86d2..26fe02e82 100644 --- a/reg-tests/sample_fetches/ubase64.vtc +++ b/reg-tests/sample_fetches/ubase64.vtc @@ -20,9 +20,8 @@ haproxy h1 -conf { frontend fe bind "fd@${fe}" acl input hdr(encode) -m found - http-request return content-type text/plain hdr encode %[hdr(encode),ub64enc] hdr decode %[hdr(decode),ub64dec] if input - http-request return content-type text/plain hdr encode %[bin(14fb9c03d97f12d97e),ub64enc] hdr decode %[str(FPucA9l_Etl-),ub64dec,hex,lower] if !input - + http-request return hdr encode %[hdr(encode),ub64enc] hdr decode %[hdr(decode),ub64dec] if input + http-request return hdr encode %[bin(14fb9c03d97f12d97e),ub64enc] hdr decode %[str(FPucA9l_Etl-),ub64dec,hex,lower] if !input } -start client c1 -connect ${h1_fe_sock} {