From 28916a61c9ff2332121614dfd9fc4f417f00676a Mon Sep 17 00:00:00 2001
From: Christopher Faulet <cfaulet@haproxy.com>
Date: Fri, 4 Aug 2023 14:54:17 +0200
Subject: [PATCH] REGTESTS: http: Create a dedicated script to test spliced
 bodyless responses

Splicing is not available on all platform. Thus a dedicated script is used
to check we properly skip payload for bodyless response when splicing is
used. This way, we are still able to test the feature with the original
script on all platform.

This patch fixes an issue on the CI introduced by commit ef2b15998
("BUG/MINOR: htx/mux-h1: Properly handle bodyless responses when splicing is
used"). It must be backported with the above commit.
---
 .../http-messaging/http_bodyless_response.vtc | 40 ---------
 .../http_bodyless_spliced_response.vtc        | 88 +++++++++++++++++++
 2 files changed, 88 insertions(+), 40 deletions(-)
 create mode 100644 reg-tests/http-messaging/http_bodyless_spliced_response.vtc

diff --git a/reg-tests/http-messaging/http_bodyless_response.vtc b/reg-tests/http-messaging/http_bodyless_response.vtc
index 5e95203661..6b53bc4f47 100644
--- a/reg-tests/http-messaging/http_bodyless_response.vtc
+++ b/reg-tests/http-messaging/http_bodyless_response.vtc
@@ -61,14 +61,6 @@ haproxy h1 -conf {
     listen fe2
         bind "fd@${fe2}"
         server s1 ${h1_int_addr}:${h1_int_port} proto h2
-
-    listen fe3
-        bind "fd@${fe3}"
-        # Rewrite the method to be sure to get the response payload
-        # on the server side
-        http-request set-method GET
-        option splice-response
-        server s1 ${s1_addr}:${s1_port}
 } -start
 
 client c1 -connect ${h1_fe1_sock} {
@@ -134,35 +126,3 @@ client c2 -connect ${h1_fe2_sock} {
         expect resp.status == 200
         expect resp.body == "last response"
 } -run
-
-client c3 -connect ${h1_fe3_sock} {
-        txreq \
-            -req "HEAD" \
-            -url "/req1"
-        rxresp
-        expect resp.status == 200
-        expect resp.body == ""
-
-        txreq \
-            -req "HEAD" \
-            -url "/req2"
-        rxresp
-        expect resp.status == 200
-        expect resp.body == ""
-
-        txreq \
-            -req "HEAD" \
-            -url "/req3"
-        rxresp
-        expect resp.status == 200
-        expect resp.body == ""
-
-        # The last one have a body and validate the connection was not closed
-        # unexpectedly and no payload was received for previous requests
-        txreq \
-            -req "GET" \
-            -url "/req4"
-        rxresp
-        expect resp.status == 200
-        expect resp.body == "last response"
-} -run
diff --git a/reg-tests/http-messaging/http_bodyless_spliced_response.vtc b/reg-tests/http-messaging/http_bodyless_spliced_response.vtc
new file mode 100644
index 0000000000..39d7aebe2d
--- /dev/null
+++ b/reg-tests/http-messaging/http_bodyless_spliced_response.vtc
@@ -0,0 +1,88 @@
+varnishtest "A test to be sure payload is skipped for bodyless responses when splicing is used"
+
+feature cmd "$HAPROXY_PROGRAM -cc 'feature(LINUX_SPLICE)'"
+feature cmd "$HAPROXY_PROGRAM $HAPROXY_ARGS -cc 'enabled(FAST-FORWARD)'"
+feature ignore_unknown_macro
+
+#REQUIRE_VERSION=2.4
+
+server s1 {
+        rxreq
+        txresp \
+          -status 200 \
+          -body "skipped data"
+
+        rxreq
+        txresp \
+          -status 200 \
+          -bodylen 50000
+
+        rxreq
+        txresp \
+          -status 200 \
+	  -nolen -hdr "Transfer-Encoding: chunked"
+       chunkedlen 15
+       chunkedlen 1024
+       chunkedlen 4048
+       chunkedlen 50000
+       chunkedlen 0
+
+        rxreq
+        txresp \
+          -status 200 \
+          -body "last response"
+} -start
+
+haproxy h1 -conf {
+    global
+        # WT: limit false-positives causing "HTTP header incomplete" due to
+        # idle server connections being randomly used and randomly expiring
+        # under us.
+        tune.idle-pool.shared off
+
+    defaults
+        mode http
+        timeout connect "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout client  "${HAPROXY_TEST_TIMEOUT-5s}"
+        timeout server  "${HAPROXY_TEST_TIMEOUT-5s}"
+
+    listen fe1
+        bind "fd@${fe1}"
+        # Rewrite the method to be sure to get the response payload
+        # on the server side
+        http-request set-method GET
+        option splice-response
+        server s1 ${s1_addr}:${s1_port}
+} -start
+
+client c1 -connect ${h1_fe1_sock} {
+        txreq \
+            -req "HEAD" \
+            -url "/req1"
+        rxresp
+        expect resp.status == 200
+        expect resp.body == ""
+
+        txreq \
+            -req "HEAD" \
+            -url "/req2"
+        rxresp
+        expect resp.status == 200
+        expect resp.body == ""
+
+        txreq \
+            -req "HEAD" \
+            -url "/req3"
+        rxresp
+        expect resp.status == 200
+        expect resp.body == ""
+
+        # The last one have a body and validate the connection was not closed
+        # unexpectedly and no payload was received for previous requests
+        txreq \
+            -req "GET" \
+            -url "/req4"
+        rxresp
+        expect resp.status == 200
+        expect resp.body == "last response"
+} -run