Changeset 1948

Timestamp:

08/18/2007 11:35:27 AM (12 months ago)

Author:

jan

Message:

fixed extracting status code from NPH scripts (fixes #1125)

Location:

branches/lighttpd-1.4.x

Files:

• NEWS (modified) (1 diff)
• src/mod_cgi.c (modified) (1 diff)
• tests/docroot/www/nph-status.pl (modified) (1 diff)
• tests/mod-cgi.t (modified) (2 diffs)

branches/lighttpd-1.4.x/NEWS

@@ -21 +21 @@
   * fixed extra Content-Length header on 1xx, 204 and 304 (#1002)
   * fixed handling of duplicate If-Modified-Since to return 304 
+  * fixed extracting status code from NPH scripts (#1125)
   * removed config-check if passwd files exist (#1188)
   

branches/lighttpd-1.4.x/src/mod_cgi.c

@@ -256 +256 @@
                                 status = strtol(s+9, NULL, 10);
 
-                                if (con->http_status >= 100 &&
-                                    con->http_status < 1000) {
+                                if (status >= 100 &&
+                                    status < 1000) {
                                         /* we expected 3 digits and didn't got them */
                                         con->parsed_response |= HTTP_STATUS;

branches/lighttpd-1.4.x/tests/docroot/www/nph-status.pl

@@ -1 +1 @@
 #!/usr/bin/perl
 
-print "HTTP/1.0 30 FooBar\r\n";
+my $status = 200;
+
+if (defined $ENV{"QUERY_STRING"}) {
+        $status = $ENV{"QUERY_STRING"};
+}
+
+print "HTTP/1.0 ".$status." FooBar\r\n";
 print "\r\n";

branches/lighttpd-1.4.x/tests/mod-cgi.t

@@ -9 +9 @@
 use strict;
 use IO::Socket;
-use Test::More tests => 16;
+use Test::More tests => 18;
 use LightyTest;
 
@@ -41 +41 @@
 
 $t->{REQUEST}  = ( <<EOF
-GET /nph-status.pl HTTP/1.0
+GET /nph-status.pl?30 HTTP/1.0
 EOF
  );
 $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ];
-ok($tf->handle_http($t) == 0, 'NPH + perl, Bug #14');
+ok($tf->handle_http($t) == 0, 'NPH + perl, invalid status-code (#14)');
+
+$t->{REQUEST}  = ( <<EOF
+GET /nph-status.pl?304 HTTP/1.0
+EOF
+ );
+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 304 } ];
+ok($tf->handle_http($t) == 0, 'NPH + perl, setting status-code (#1125)');
+
+$t->{REQUEST}  = ( <<EOF
+GET /nph-status.pl?200 HTTP/1.0
+EOF
+ );
+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ];
+ok($tf->handle_http($t) == 0, 'NPH + perl, setting status-code');
 
 $t->{REQUEST} = ( <<EOF