Changeset 64

Timestamp:

03/01/2005 04:57:24 PM (4 years ago)

Author:

jan

Message:

added tests for restarting fcgi-procs after they died

Location:

trunk/tests

Files:

• fastcgi-responder.conf (modified) (2 diffs)
• fcgi-responder.c (modified) (3 diffs)
• run-tests.pl (modified) (3 diffs)

trunk/tests/fastcgi-responder.conf

@@ -2 +2 @@
 server.pid-file              = "/tmp/lighttpd/lighttpd.pid"
 
-debug.log-request-header   = "enable"
-debug.log-response-header  = "enable"
-debug.log-request-handling = "enable"
+#debug.log-request-header   = "enable"
+#debug.log-response-header  = "enable"
+#debug.log-request-handling = "enable"
+#debug.log-state-handling = "enable"
+
+#fastcgi.debug = 1
 
 ## bind to port (default: 80)
@@ -89 +92 @@
                                     "port" => 1028,
                                     "bin-path" => "./fcgi-responder",
-                                    "check-local" => "disable"
+                                    "check-local" => "disable",
+                                    "max-procs" => 1,
+                                    "min-procs" => 1
                                   )
                                 )

trunk/tests/fcgi-responder.c

@@ -5 +5 @@
 
 int main () {
-        char* p;
+        int num_requests = 2;
         
-        while (FCGI_Accept() >= 0) {   
+        while (num_requests > 0 &&
+               FCGI_Accept() >= 0) {
+                char* p;
+                
                 if (NULL != (p = getenv("QUERY_STRING"))) {
                         if (0 == strcmp(p, "lf")) {
@@ -21 +24 @@
                                 fflush(stdout);
                                 printf("\r\n");
+                        } else if (0 == strcmp(p, "die-at-end")) {
+                                printf("Status: 200 OK\r\n\r\n");
+                                num_requests--;
                         } else {
                                 printf("Status: 200 OK\r\n\r\n");
@@ -28 +34 @@
                 }
                  
-                printf("test123");  
+                printf("test123");
         }
-
+        
         return 0;
 }

trunk/tests/run-tests.pl

@@ -3 +3 @@
 use strict;
 use IO::Socket;
-use Test::More tests => 124;
+use Test::More tests => 126;
 
 
@@ -1221 +1221 @@
 ok(handle_http == 0, 'line-ending \n + \n');
 
-
-
 @request  = ( <<EOF
 GET /index.fcgi?slow-crlf HTTP/1.0
@@ -1231 +1229 @@
 ok(handle_http == 0, 'line-ending \r\n + \r\n');
 
+@request  = ( <<EOF
+GET /index.fcgi?die-at-end HTTP/1.0
+Host: www.example.org
+EOF
+ );
+@response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => 'test123' } );
+ok(handle_http == 0, 'killing fastcgi and wait for restart');
+
+@request  = ( <<EOF
+GET /index.fcgi?crlf HTTP/1.0
+Host: www.example.org
+EOF
+ );
+@response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => 'test123' } );
+ok(handle_http == 0, 'regular response of after restart');
+
+
 
 ok(stop_proc == 0, "Stopping lighttpd");