Changeset 99eb567 in mod_gnutls

Timestamp:

Nov 4, 2018, 9:42:51 AM (2 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

master

Children:

7ff6c6c

Parents:

7f2fd55

Message:

Test suite: Use static output instead of CGI for test 30_ip_based_vhosts

The CGI output usually but not always chunked encoding, and the "not
always" part causes trouble because the output is compared literally
with the expected output. Requesting a static file avoids this.

Location:

test/tests/30_ip_based_vhosts

Files:

• apache.conf (modified) (2 diffs)
• input (modified) (1 diff)
• output (modified) (1 diff)

test/tests/30_ip_based_vhosts/apache.conf

@@ -1 +1 @@
 Include ${srcdir}/base_apache.conf
-Include ${srcdir}/cgi_module.conf
 
 GnuTLSCache ${DEFAULT_CACHE}
+
+LoadModule      rewrite_module  ${AP_LIBEXECDIR}/mod_rewrite.so
 
 <VirtualHost ${VHOST1_IP}:${TEST_PORT}>
@@ -17 +18 @@
         GnuTLSKeyFile           server/secret.key
 
-        # CGI is allowed only on this virtual host, so a successful
-        # request to a CGI script shows that the right server has been
-        # selected.
-        <Directory ${srcdir}/data>
-                Options +ExecCGI
-        </Directory>
+        # Use mod_rewrite to set up a path that will work only on this
+        # virtual host
+        RewriteEngine   On
+        RewriteRule     "^/vhost/test\.txt$" "/test.txt" [PT]
 </VirtualHost>

test/tests/30_ip_based_vhosts/input

@@ -1 @@
-GET /dump.cgi HTTP/1.1
+GET /vhost/test.txt HTTP/1.1
 Host: __HOSTNAME__
 

test/tests/30_ip_based_vhosts/output

@@ -1 @@
-HTTP/1.1 200 OK
+Accept-Ranges: bytes
+Content-Length: 5
 Connection: close
-Transfer-Encoding: chunked
 Content-Type: text/plain
 
-54
-----Certificate:----
-
-
-----Verification Status:----
-NONE
-
-----SubjectAltName:----
-
-
-
-0
-
+test
 - Peer has closed the GnuTLS connection