Changeset 1914

Timestamp:

08/15/2007 11:38:49 AM (13 months ago)

Author:

jan

Message:

added protection that CONTENT_LENGTH is only added to the env
if it is > 0

- added the CGI test cases to the test-suite again
- added testcase to verify the patch works

Location:

trunk

Files:

• NEWS (modified) (1 diff)
• src/mod_cgi.c (modified) (1 diff)
• tests/default.conf (modified) (2 diffs)
• tests/mod-cgi.t (modified) (3 diffs)

trunk/NEWS

@@ -16 +16 @@
   * fixed different ETag length on 32/64 platforms (#1279)
   * fixed conditional dir-listing.exclude (#930)
+  * fixed CONTENT_LENGTH = -1 in mod_cgi (#1276)
 
 - 1.4.14 - ???

trunk/src/mod_cgi.c

@@ -739 +739 @@
 
 #ifdef USE_OPENSSL
-       if (srv_sock->is_ssl) {
-               cgi_env_add(&env, CONST_STR_LEN("HTTPS"), CONST_STR_LEN("on"));
-       }
+                if (srv_sock->is_ssl) {
+                        cgi_env_add(&env, CONST_STR_LEN("HTTPS"), CONST_STR_LEN("on"));
+                }
 #endif
 
                 /* request.content_length < SSIZE_MAX, see request.c */
-                ltostr(buf, con->request.content_length);
-                cgi_env_add(&env, CONST_STR_LEN("CONTENT_LENGTH"), buf, strlen(buf));
+                if (con->request.content_length > 0) {
+                        ltostr(buf, con->request.content_length);
+                        cgi_env_add(&env, CONST_STR_LEN("CONTENT_LENGTH"), buf, strlen(buf));
+                }
                 cgi_env_add(&env, CONST_STR_LEN("SCRIPT_FILENAME"), CONST_BUF_LEN(con->physical.path));
                 cgi_env_add(&env, CONST_STR_LEN("SCRIPT_NAME"), CONST_BUF_LEN(con->uri.path));

trunk/tests/default.conf

@@ -23 +23 @@
 #                               "mod_fastcgi",
 #                               "mod_proxy",
-#                               "mod_cgi",
+                                "mod_cgi",
                                 "mod_compress",
                                 "mod_userdir",
@@ -60 +60 @@
 setenv.add-environment      = ( "TRAC_ENV" => "tracenv", "SETENV" => "setenv")
 
-# cgi.assign                  = ( ".pl"  => "/usr/bin/perl",
-#                                ".cgi" => "/usr/bin/perl",
-#                               ".py"  => "/usr/bin/python" )
+cgi.assign                  = ( ".pl"  => "/usr/bin/perl",
+                                ".cgi" => "/usr/bin/perl",
+                                ".py"  => "/usr/bin/python" )
                         
 userdir.include-user = ( "jan" )

trunk/tests/mod-cgi.t

@@ -9 +9 @@
 use strict;
 use IO::Socket;
-use Test::More tests => 15;
+use Test::More tests => 16;
 use LightyTest;
 
@@ -15 +15 @@
 my $t;
     
-SKIP: {
-  skip "disabled for now", 15;
 ok($tf->start_proc == 0, "Starting lighttpd") or die();
 
@@ -119 +117 @@
 ok($tf->handle_http($t) == 0, 'cgi-env: HTTP_HOST');
 
+$t->{REQUEST}  = ( <<EOF
+GET /get-header.pl?CONTENT_LENGTH HTTP/1.0
+Host: www.example.org
+Connection: close
+EOF
+ );
+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, '+Content-Length' => '' } ];
+ok($tf->handle_http($t) == 0, 'cgi-env: CONTENT_LENGTH');
+
 ok($tf->stop_proc == 0, "Stopping lighttpd");
-}
+