]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
REGTEST/MINOR: Wrong URI syntax.
authorFrédéric Lécaille <flecaille@haproxy.com>
Thu, 12 Jul 2018 08:48:06 +0000 (10:48 +0200)
committerWilly Tarreau <w@1wt.eu>
Thu, 12 Jul 2018 15:52:27 +0000 (17:52 +0200)
Ilya Shipitsin reported that with some curl versions this reg test
may fail due to a wrong URI syntax with ::1 ipv6 local address in
this varnishtest script. This patch fixes this syntax issue and
replaces the iteration of "procees" commands by a "shell" command
to start curl processes (must be faster).

Thanks to Ilya Shipitsin for having reported this VTC file bug.

reg-tests/ssl/h00000.vtc

index 0765cb48ae46c7e14a3fcbc5a7d02acc8de9e349..819f3850f7238c938786dddba60257564f711200 100644 (file)
@@ -31,14 +31,13 @@ haproxy h1 -conf {
     http-request redirect location /
 } -start
 
-process p1 "curl -i -k https://${h1_frt_addr}:${h1_frt_port}" -start
-process p2 "curl -i -k https://${h1_frt_addr}:${h1_frt_port}" -start
-process p3 "curl -i -k https://${h1_frt_addr}:${h1_frt_port}" -start
-process p4 "curl -i -k https://${h1_frt_addr}:${h1_frt_port}" -start
-process p5 "curl -i -k https://${h1_frt_addr}:${h1_frt_port}" -start
-
-process p1 -wait
-process p2 -wait
-process p3 -wait
-process p4 -wait
-process p5 -wait
+shell {
+    HOST=${h1_frt_addr}
+    if [ "${h1_frt_addr}" = "::1" ] ; then
+        HOST="[::1]"
+    fi
+    for i in 1 2 3 4 5; do
+        curl -i -k https://$HOST:${h1_frt_port} & pids="$pids $!"
+    done
+    wait $pids
+}