Changeset 1898

Timestamp:

08/13/2007 11:09:11 AM (14 months ago)

Author:

darix

Message:

- fixed 404 testsuite
- added optional fastcgi handler

Location:

branches/lighttpd-1.4.x/tests

Files:

• 404-handler.conf (modified) (3 diffs)
• core-404-handler.t (modified) (3 diffs)
• docroot/www/404.fcgi (added)
• docroot/www/404.pl (modified) (1 diff)

branches/lighttpd-1.4.x/tests/404-handler.conf

@@ -1 +1 @@
 debug.log-request-handling   = "enable"
+debug.log-response-header   = "enable"
+debug.log-request-header   = "enable"
 
 server.document-root         = env.SRCDIR + "/tmp/lighttpd/servers/www.example.org/pages/"
@@ -15 +17 @@
 
 server.modules              = (
+                                  "mod_fastcgi",
                                   "mod_cgi",
                                 "mod_accesslog" )
@@ -27 +30 @@
 cgi.assign = (".pl" => "/usr/bin/perl" )
 
+# fastcgi.server += ( "/404.pl" =>
+#                    ( "404-handler" =>
+#                      (
+#                        "socket" => env.SRCDIR + "/tmp/pl-404-fastcgi-1.socket",
+#                        "bin-path" => server.document-root + "/404.pl",
+#                        "max-procs" => 1,
+#                        "check-local" => "disable",
+#                        "broken-scriptfilename" => "enable",
+#                      )
+#                    ),
+#                  )
+
 $HTTP["url"] =~ "^/static/" {
   server.error-handler-404 = "/404.html"
 }
-else $HTTP["url"] =~ "^/dynamic/200/" {
+else $HTTP["url"] =~ "^/dynamic/" {
   server.error-handler-404 = "/404.pl"
 }
-else $HTTP["url"] =~ "^/dynamic/302/" {
-  server.error-handler-404 = "/404.pl"
-}
-else $HTTP["url"] =~ "^/dynamic/404/" {
-  server.error-handler-404 = "/404.pl"
-}

branches/lighttpd-1.4.x/tests/core-404-handler.t

@@ -24 +24 @@
 my $t;
 $tf->{CONFIGFILE} = '404-handler.conf';
+
 ok($tf->start_proc == 0, "Starting lighttpd") or die();
 
@@ -30 +31 @@
 EOF
  );
-$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 404, 'HTTP-Content' => "static not found\n" } ];
+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => "static not found\n" } ];
 ok($tf->handle_http($t) == 0, '404 handler => static');
 
+#
+#
+#
 $t->{REQUEST}  = ( <<EOF
 GET /dynamic/200/notfound HTTP/1.0
@@ -48 +52 @@
 
 $t->{REQUEST}  = ( <<EOF
-GET /dynamic/200/notfound HTTP/1.0
+GET /dynamic/404/notfound HTTP/1.0
 EOF
  );
 $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 404, 'HTTP-Content' => "Not found here\n" } ];
-ok($tf->handle_http($t) == 0, '404 handler => dynamic(200)');
+ok($tf->handle_http($t) == 0, '404 handler => dynamic(404)');
 
 ok($tf->stop_proc == 0, "Stopping lighttpd");

branches/lighttpd-1.4.x/tests/docroot/www/404.pl

@@ -9 +9 @@
   print ("found here\n");
 }
-elsif ($request_uri =~ m|^/dynamic/301/| ) {
+elsif ($request_uri =~ m|^/dynamic/302/| ) {
   print header( -status=>302,
                 -location => 'http://www.example.org/');