Tidy up shell syntax in some CGI scripts.

Add missing quotes round shell variable: the apache error log for the
network test server contains lots of complaints saying:
.../httpcachetest_cachecontrol.cgi: line 2: [: too many arguments
There were other scripts with similar un-quoted variable lookups.

Eliminated a bunch of spurious semicolons.

Change-Id: Ied20d67d641e368871a5a9c0d89a8d6a378fa18b
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

29 files changed, 59 insertions, 59 deletions

diff --git a/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_cachecontrol-expire.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_cachecontrol-expire.cgi
index 7dc506fc1e..c570ee88f9 100755
--- a/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_cachecontrol-expire.cgi
+++ b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_cachecontrol-expire.cgi
@@ -2,6 +2,6 @@
 # cache control takes precedence over expires
 echo "Cache-Control: max-age=-1"
 echo "Expires: Mon, 30 Oct 2028 14:19:41 GMT"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo ""
 echo "Hello World!"
diff --git a/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_cachecontrol.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_cachecontrol.cgi
index f2edfc161f..83b8c94b79 100755
--- a/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_cachecontrol.cgi
+++ b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_cachecontrol.cgi
@@ -1,13 +1,13 @@
 #!/bin/bash
-if [ ! -z ${HTTP_IF_MODIFIED_SINCE} ] ; then
+if [ ! -z "${HTTP_IF_MODIFIED_SINCE}" ] ; then
     echo "Status: 304"
     echo ""
-    exit;
+    exit
 fi
 
 cc=`echo "${QUERY_STRING}" | sed -e s/%20/\ /g`
 echo "Cache-Control: $cc"
 echo "Last-Modified: Sat, 31 Oct 1981 06:00:00 GMT"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo ""
 echo "Hello World!"
diff --git a/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_cachecontrol200.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_cachecontrol200.cgi
index e44d5ed570..bc1fdf6b6f 100755
--- a/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_cachecontrol200.cgi
+++ b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_cachecontrol200.cgi
@@ -3,7 +3,7 @@ cc=`echo "${QUERY_STRING}" | sed -e s/%20/\ /g`
 echo "Status: 200"
 echo "Cache-Control: $cc"
 echo "Last-Modified: Sat, 31 Oct 1981 06:00:00 GMT"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo "X-Script: $0"
 echo ""
 echo "Hello World!"
diff --git a/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_etag200.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_etag200.cgi
index 0966abfdd1..630957b4e5 100755
--- a/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_etag200.cgi
+++ b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_etag200.cgi
@@ -1,5 +1,5 @@
 #!/bin/bash
 echo "ETag: foo"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo ""
 echo "Hello World!"
diff --git a/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_etag304.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_etag304.cgi
index 91a4b922bd..22e5f83db2 100755
--- a/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_etag304.cgi
+++ b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_etag304.cgi
@@ -1,11 +1,11 @@
 #!/bin/bash
-if [ ! -z ${HTTP_IF_NONE_MATCH} ] ; then
+if [ ! -z "${HTTP_IF_NONE_MATCH}" ] ; then
     echo "Status: 304"
     echo ""
-    exit;
+    exit
 fi
 
 echo "ETag: foo"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo ""
 echo "Hello World!"
diff --git a/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_expires200.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_expires200.cgi
index e18ebc86ad..f9aab1b0c4 100755
--- a/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_expires200.cgi
+++ b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_expires200.cgi
@@ -1,5 +1,5 @@
 #!/bin/bash
 echo "Expires: Sat, 31 Oct 1981 6:00:00 GMT"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo ""
 echo "Hello World!"
diff --git a/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_expires304.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_expires304.cgi
index 1c7de1cd77..9ae28a00c8 100755
--- a/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_expires304.cgi
+++ b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_expires304.cgi
@@ -1,11 +1,11 @@
 #!/bin/bash
-if [ ${HTTP_IF_MODIFIED_SINCE} == "Mon, 30 Oct 2028 14:19:41 GMT" ] ; then
+if [ "${HTTP_IF_MODIFIED_SINCE}" == "Mon, 30 Oct 2028 14:19:41 GMT" ] ; then
     echo "Status: 304"
     echo ""
-    exit;
+    exit
 fi
 
 echo "Expires: Mon, 30 Oct 2028 14:19:41 GMT"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo ""
 echo "Hello World!"
diff --git a/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_expires500.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_expires500.cgi
index 9615c4f0bd..295d554bac 100755
--- a/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_expires500.cgi
+++ b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_expires500.cgi
@@ -1,11 +1,11 @@
 #!/bin/bash
-if [ ! -z ${HTTP_IF_MODIFIED_SINCE} ] ; then
+if [ ! -z "${HTTP_IF_MODIFIED_SINCE}" ] ; then
     echo "Status: 500"
     echo ""
-    exit;
+    exit
 fi
 
 echo "Expires: Mon, 30 Oct 2028 14:19:41 GMT"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo ""
 echo "Hello World!"
diff --git a/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_lastModified200.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_lastModified200.cgi
index 5dc219b1e7..b8ef81ed92 100755
--- a/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_lastModified200.cgi
+++ b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_lastModified200.cgi
@@ -1,5 +1,5 @@
 #!/bin/bash
 echo "Last-Modified: Sat, 31 Oct 1981 6:00:00 GMT"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo ""
 echo "Hello World!"
diff --git a/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_lastModified304.cgi b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_lastModified304.cgi
index bdf23bed2f..fbf3461b57 100755
--- a/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_lastModified304.cgi
+++ b/tests/auto/network/access/qabstractnetworkcache/tests/httpcachetest_lastModified304.cgi
@@ -1,11 +1,11 @@
 #!/bin/bash
-if [ ${HTTP_IF_MODIFIED_SINCE} == "Sat, 31 Oct 1981 06:00:00 GMT" ] ; then
+if [ "${HTTP_IF_MODIFIED_SINCE}" == "Sat, 31 Oct 1981 06:00:00 GMT" ] ; then
     echo "Status: 304"
     echo ""
-    exit;
+    exit
 fi
 
 echo "Last-Modified: Sat, 31 Oct 1981 06:00:00 GMT"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo ""
 echo "Hello World!"
diff --git a/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_cachecontrol-expire.cgi b/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_cachecontrol-expire.cgi
index 7dc506fc1e..c570ee88f9 100755
--- a/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_cachecontrol-expire.cgi
+++ b/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_cachecontrol-expire.cgi
@@ -2,6 +2,6 @@
 # cache control takes precedence over expires
 echo "Cache-Control: max-age=-1"
 echo "Expires: Mon, 30 Oct 2028 14:19:41 GMT"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo ""
 echo "Hello World!"
diff --git a/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_cachecontrol.cgi b/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_cachecontrol.cgi
index f2edfc161f..83b8c94b79 100755
--- a/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_cachecontrol.cgi
+++ b/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_cachecontrol.cgi
@@ -1,13 +1,13 @@
 #!/bin/bash
-if [ ! -z ${HTTP_IF_MODIFIED_SINCE} ] ; then
+if [ ! -z "${HTTP_IF_MODIFIED_SINCE}" ] ; then
     echo "Status: 304"
     echo ""
-    exit;
+    exit
 fi
 
 cc=`echo "${QUERY_STRING}" | sed -e s/%20/\ /g`
 echo "Cache-Control: $cc"
 echo "Last-Modified: Sat, 31 Oct 1981 06:00:00 GMT"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo ""
 echo "Hello World!"
diff --git a/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_cachecontrol200.cgi b/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_cachecontrol200.cgi
index e44d5ed570..bc1fdf6b6f 100755
--- a/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_cachecontrol200.cgi
+++ b/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_cachecontrol200.cgi
@@ -3,7 +3,7 @@ cc=`echo "${QUERY_STRING}" | sed -e s/%20/\ /g`
 echo "Status: 200"
 echo "Cache-Control: $cc"
 echo "Last-Modified: Sat, 31 Oct 1981 06:00:00 GMT"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo "X-Script: $0"
 echo ""
 echo "Hello World!"
diff --git a/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_etag200.cgi b/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_etag200.cgi
index 0966abfdd1..630957b4e5 100755
--- a/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_etag200.cgi
+++ b/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_etag200.cgi
@@ -1,5 +1,5 @@
 #!/bin/bash
 echo "ETag: foo"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo ""
 echo "Hello World!"
diff --git a/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_etag304.cgi b/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_etag304.cgi
index 91a4b922bd..22e5f83db2 100755
--- a/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_etag304.cgi
+++ b/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_etag304.cgi
@@ -1,11 +1,11 @@
 #!/bin/bash
-if [ ! -z ${HTTP_IF_NONE_MATCH} ] ; then
+if [ ! -z "${HTTP_IF_NONE_MATCH}" ] ; then
     echo "Status: 304"
     echo ""
-    exit;
+    exit
 fi
 
 echo "ETag: foo"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo ""
 echo "Hello World!"
diff --git a/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_expires200.cgi b/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_expires200.cgi
index e18ebc86ad..f9aab1b0c4 100755
--- a/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_expires200.cgi
+++ b/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_expires200.cgi
@@ -1,5 +1,5 @@
 #!/bin/bash
 echo "Expires: Sat, 31 Oct 1981 6:00:00 GMT"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo ""
 echo "Hello World!"
diff --git a/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_expires304.cgi b/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_expires304.cgi
index 1c7de1cd77..9ae28a00c8 100755
--- a/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_expires304.cgi
+++ b/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_expires304.cgi
@@ -1,11 +1,11 @@
 #!/bin/bash
-if [ ${HTTP_IF_MODIFIED_SINCE} == "Mon, 30 Oct 2028 14:19:41 GMT" ] ; then
+if [ "${HTTP_IF_MODIFIED_SINCE}" == "Mon, 30 Oct 2028 14:19:41 GMT" ] ; then
     echo "Status: 304"
     echo ""
-    exit;
+    exit
 fi
 
 echo "Expires: Mon, 30 Oct 2028 14:19:41 GMT"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo ""
 echo "Hello World!"
diff --git a/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_expires500.cgi b/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_expires500.cgi
index 9615c4f0bd..295d554bac 100755
--- a/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_expires500.cgi
+++ b/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_expires500.cgi
@@ -1,11 +1,11 @@
 #!/bin/bash
-if [ ! -z ${HTTP_IF_MODIFIED_SINCE} ] ; then
+if [ ! -z "${HTTP_IF_MODIFIED_SINCE}" ] ; then
     echo "Status: 500"
     echo ""
-    exit;
+    exit
 fi
 
 echo "Expires: Mon, 30 Oct 2028 14:19:41 GMT"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo ""
 echo "Hello World!"
diff --git a/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_lastModified200.cgi b/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_lastModified200.cgi
index 5dc219b1e7..b8ef81ed92 100755
--- a/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_lastModified200.cgi
+++ b/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_lastModified200.cgi
@@ -1,5 +1,5 @@
 #!/bin/bash
 echo "Last-Modified: Sat, 31 Oct 1981 6:00:00 GMT"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo ""
 echo "Hello World!"
diff --git a/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_lastModified304.cgi b/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_lastModified304.cgi
index bdf23bed2f..fbf3461b57 100755
--- a/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_lastModified304.cgi
+++ b/tests/auto/network/support/modules/network_test_server/files/www/cgi-bin/httpcachetest_lastModified304.cgi
@@ -1,11 +1,11 @@
 #!/bin/bash
-if [ ${HTTP_IF_MODIFIED_SINCE} == "Sat, 31 Oct 1981 06:00:00 GMT" ] ; then
+if [ "${HTTP_IF_MODIFIED_SINCE}" == "Sat, 31 Oct 1981 06:00:00 GMT" ] ; then
     echo "Status: 304"
     echo ""
-    exit;
+    exit
 fi
 
 echo "Last-Modified: Sat, 31 Oct 1981 06:00:00 GMT"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo ""
 echo "Hello World!"
diff --git a/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_cachecontrol-expire.cgi b/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_cachecontrol-expire.cgi
index 7dc506fc1e..c570ee88f9 100755
--- a/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_cachecontrol-expire.cgi
+++ b/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_cachecontrol-expire.cgi
@@ -2,6 +2,6 @@
 # cache control takes precedence over expires
 echo "Cache-Control: max-age=-1"
 echo "Expires: Mon, 30 Oct 2028 14:19:41 GMT"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo ""
 echo "Hello World!"
diff --git a/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_cachecontrol.cgi b/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_cachecontrol.cgi
index f2edfc161f..83b8c94b79 100755
--- a/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_cachecontrol.cgi
+++ b/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_cachecontrol.cgi
@@ -1,13 +1,13 @@
 #!/bin/bash
-if [ ! -z ${HTTP_IF_MODIFIED_SINCE} ] ; then
+if [ ! -z "${HTTP_IF_MODIFIED_SINCE}" ] ; then
     echo "Status: 304"
     echo ""
-    exit;
+    exit
 fi
 
 cc=`echo "${QUERY_STRING}" | sed -e s/%20/\ /g`
 echo "Cache-Control: $cc"
 echo "Last-Modified: Sat, 31 Oct 1981 06:00:00 GMT"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo ""
 echo "Hello World!"
diff --git a/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_etag200.cgi b/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_etag200.cgi
index 0966abfdd1..630957b4e5 100755
--- a/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_etag200.cgi
+++ b/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_etag200.cgi
@@ -1,5 +1,5 @@
 #!/bin/bash
 echo "ETag: foo"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo ""
 echo "Hello World!"
diff --git a/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_etag304.cgi b/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_etag304.cgi
index 91a4b922bd..22e5f83db2 100755
--- a/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_etag304.cgi
+++ b/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_etag304.cgi
@@ -1,11 +1,11 @@
 #!/bin/bash
-if [ ! -z ${HTTP_IF_NONE_MATCH} ] ; then
+if [ ! -z "${HTTP_IF_NONE_MATCH}" ] ; then
     echo "Status: 304"
     echo ""
-    exit;
+    exit
 fi
 
 echo "ETag: foo"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo ""
 echo "Hello World!"
diff --git a/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_expires200.cgi b/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_expires200.cgi
index e18ebc86ad..f9aab1b0c4 100755
--- a/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_expires200.cgi
+++ b/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_expires200.cgi
@@ -1,5 +1,5 @@
 #!/bin/bash
 echo "Expires: Sat, 31 Oct 1981 6:00:00 GMT"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo ""
 echo "Hello World!"
diff --git a/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_expires304.cgi b/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_expires304.cgi
index 1c7de1cd77..9ae28a00c8 100755
--- a/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_expires304.cgi
+++ b/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_expires304.cgi
@@ -1,11 +1,11 @@
 #!/bin/bash
-if [ ${HTTP_IF_MODIFIED_SINCE} == "Mon, 30 Oct 2028 14:19:41 GMT" ] ; then
+if [ "${HTTP_IF_MODIFIED_SINCE}" == "Mon, 30 Oct 2028 14:19:41 GMT" ] ; then
     echo "Status: 304"
     echo ""
-    exit;
+    exit
 fi
 
 echo "Expires: Mon, 30 Oct 2028 14:19:41 GMT"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo ""
 echo "Hello World!"
diff --git a/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_expires500.cgi b/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_expires500.cgi
index 9615c4f0bd..295d554bac 100755
--- a/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_expires500.cgi
+++ b/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_expires500.cgi
@@ -1,11 +1,11 @@
 #!/bin/bash
-if [ ! -z ${HTTP_IF_MODIFIED_SINCE} ] ; then
+if [ ! -z "${HTTP_IF_MODIFIED_SINCE}" ] ; then
     echo "Status: 500"
     echo ""
-    exit;
+    exit
 fi
 
 echo "Expires: Mon, 30 Oct 2028 14:19:41 GMT"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo ""
 echo "Hello World!"
diff --git a/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_lastModified200.cgi b/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_lastModified200.cgi
index 5dc219b1e7..b8ef81ed92 100755
--- a/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_lastModified200.cgi
+++ b/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_lastModified200.cgi
@@ -1,5 +1,5 @@
 #!/bin/bash
 echo "Last-Modified: Sat, 31 Oct 1981 6:00:00 GMT"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo ""
 echo "Hello World!"
diff --git a/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_lastModified304.cgi b/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_lastModified304.cgi
index bdf23bed2f..fbf3461b57 100755
--- a/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_lastModified304.cgi
+++ b/tests/auto/network/support/modules/network_test_server/files/www/htdocs/qtest/cgi-bin/httpcachetest_lastModified304.cgi
@@ -1,11 +1,11 @@
 #!/bin/bash
-if [ ${HTTP_IF_MODIFIED_SINCE} == "Sat, 31 Oct 1981 06:00:00 GMT" ] ; then
+if [ "${HTTP_IF_MODIFIED_SINCE}" == "Sat, 31 Oct 1981 06:00:00 GMT" ] ; then
     echo "Status: 304"
     echo ""
-    exit;
+    exit
 fi
 
 echo "Last-Modified: Sat, 31 Oct 1981 06:00:00 GMT"
-echo "Content-type: text/html";
+echo "Content-type: text/html"
 echo ""
 echo "Hello World!"