Changeset 62

Timestamp:

03/01/2005 01:37:40 PM (4 years ago)

Author:

jan

Message:

added checks for the line-terminator handling and cleanup the configs

Location:

trunk

Files:

• src/mod_fastcgi.c (modified) (2 diffs)
• tests/Makefile.am (modified) (2 diffs)
• tests/fastcgi-12.conf (deleted)
• tests/fastcgi-auth.conf (moved) (moved from trunk/tests/fastcgi-11.conf)
• tests/fastcgi-responder.conf (added)
• tests/fcgi-responder.c (added)
• tests/run-tests.pl (modified) (5 diffs)

trunk/src/mod_fastcgi.c

@@ -2026 +2026 @@
                                                 c = hctx->response->ptr + 1;
                                         } else if (NULL != (c = buffer_search_string_len(hctx->response, "\r\n\r\n", 4))) {
-                                                hlen = c - hctx->response->ptr + 4;
+                                                c += 4;
+                                                hlen = c - hctx->response->ptr;
+                                                
                                         } else if (NULL != (c = buffer_search_string_len(hctx->response, "\n\n", 2))) {
-                                                hlen = c - hctx->response->ptr + 2;
+                                                c += 2;
+                                                hlen = c - hctx->response->ptr;
                                         }
                                         
@@ -2054 +2057 @@
                                                 
                                                         if (blen) {
-                                                                http_chunk_append_mem(srv, con, c + 4, blen + 1);
+                                                                http_chunk_append_mem(srv, con, c, blen + 1);
                                                                 joblist_append(srv, con);
 #if 0

trunk/tests/Makefile.am

@@ -3 +3 @@
 
 if CHECK_WITH_FASTCGI
-check_PROGRAMS=fcgi-auth
+check_PROGRAMS=fcgi-auth fcgi-responder
 
 fcgi_auth_SOURCES=fcgi-auth.c
 fcgi_auth_LDADD=-lfcgi
+
+fcgi_responder_SOURCES=fcgi-responder.c
+fcgi_responder_LDADD=-lfcgi
 endif
 
@@ -15 +18 @@
 
 CONFS=fastcgi-10.conf \
-      fastcgi-11.conf \
-      fastcgi-12.conf \
+      fastcgi-auth.conf \
+      fastcgi-responder.conf \
       fastcgi-13.conf \
       bug-06.conf \

trunk/tests/run-tests.pl

@@ -3 +3 @@
 use strict;
 use IO::Socket;
-use Test::More tests => 120;
+use Test::More tests => 124;
 
 
@@ -33 +33 @@
 
         kill('TERM',$pid) or return -1;
-        select(undef, undef, undef, 0.25);
+        select(undef, undef, undef, 0.01);
 
         return 0;
@@ -1138 +1138 @@
 ok(stop_proc == 0, "Stopping lighttpd");
 
-$configfile = 'fastcgi-11.conf';
-ok(start_proc == 0, "Starting lighttpd with fastcgi-11.conf") or die();
+$configfile = 'fastcgi-auth.conf';
+ok(start_proc == 0, "Starting lighttpd with $configfile") or die();
 @request  = ( <<EOF
 GET /index.html?ok HTTP/1.0
@@ -1148 +1148 @@
 ok(handle_http == 0, 'FastCGI - Auth');
 
-ok(stop_proc == 0, "Stopping lighttpd");
-
-$configfile = 'fastcgi-12.conf';
-ok(start_proc == 0, "Starting lighttpd with fastcgi-12.conf") or die();
 @request  = ( <<EOF
 GET /index.html?fail HTTP/1.0
@@ -1199 +1195 @@
 ok(stop_proc == 0, "Stopping lighttpd");
 
-
+$configfile = 'fastcgi-responder.conf';
+ok(start_proc == 0, "Starting lighttpd with $configfile") or die();
+@request  = ( <<EOF
+GET /index.fcgi?lf HTTP/1.0
+Host: www.example.org
+EOF
+ );
+@response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => 'test123' } );
+ok(handle_http == 0, 'line-ending \n\n');
+
+@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, 'line-ending \r\n\r\n');
+
+@request  = ( <<EOF
+GET /index.fcgi?slow-lf HTTP/1.0
+Host: www.example.org
+EOF
+ );
+@response = ( { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, 'HTTP-Content' => 'test123' } );
+ok(handle_http == 0, 'line-ending \n + \n');
+
+
+
+@request  = ( <<EOF
+GET /index.fcgi?slow-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, 'line-ending \r\n + \r\n');
+
+
+ok(stop_proc == 0, "Stopping lighttpd");
+