Changeset 91

Timestamp:

03/04/2005 01:10:35 PM (3 years ago)

Author:

jan

Message:

check that conditionals and simple-vhost work together

Location:

trunk/tests

Files:

• core-response.t (modified) (4 diffs)
• lighttpd.conf (modified) (2 diffs)

trunk/tests/core-response.t

@@ -3 +3 @@
 use strict;
 use IO::Socket;
-use Test::More tests => 8;
+use Test::More tests => 10;
 
 my $basedir = (defined $ENV{'top_builddir'} ? $ENV{'top_builddir'} : '..');
@@ -208 +208 @@
 
 
+
 ## Low-Level Response-Header Parsing - Content-Length
 
@@ -230 +231 @@
 ## Low-Level Response-Header Parsing - Location
 
-
-
 @request  = ( <<EOF
 GET /dummydir HTTP/1.0
@@ -246 +245 @@
 ok(handle_http == 0, 'internal redirect in directory + querystring');
 
-
+## simple-vhost
+
+@request  = ( <<EOF
+GET /12345.txt HTTP/1.0
+Host: no-simple.example.org
+EOF
+ );
+@response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'Content-Length' => '6' } );
+ok(handle_http == 0, 'disabling simple-vhost via conditionals');
+
+@request  = ( <<EOF
+GET /12345.txt HTTP/1.0
+Host: simple.example.org
+EOF
+ );
+@response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 404 } );
+ok(handle_http == 0, 'simple-vhost via conditionals');
 
 ok(stop_proc == 0, "Stopping lighttpd");

trunk/tests/lighttpd.conf

@@ -135 +135 @@
 status.config-url           = "/server-config"
 
-simple-vhost.document-root  = "pages"
-simple-vhost.server-root    = "/tmp/lighttpd/servers/"
-simple-vhost.default-host   = "www.example.org"
-
 $HTTP["host"] == "vvv.example.org" {
   server.document-root = "/tmp/lighttpd/servers/www.example.org/pages/"
@@ -148 +144 @@
 }
 
+$HTTP["host"] == "no-simple.example.org" {
+  server.document-root = "/tmp/lighttpd/servers/123.example.org/pages/"
+  server.name = "zzz.example.org"
+}
+
+$HTTP["host"] !~ "(no-simple\.example\.org)" {
+  simple-vhost.document-root  = "pages"
+  simple-vhost.server-root    = "/tmp/lighttpd/servers/"
+  simple-vhost.default-host   = "www.example.org"
+}
+