Changeset 1949

Timestamp:

08/18/2007 11:42:13 AM (13 months ago)

Author:

jan

Message:

fixed extra Content-Length header on 1xx, 204 and 304 (fixes #1102)

Location:

trunk

Files:

• NEWS (modified) (1 diff)
• src/response.c (modified) (1 diff)
• tests/LightyTest.pm (modified) (1 diff)
• tests/request.t (modified) (2 diffs)

trunk/NEWS

@@ -18 +18 @@
   * fixed CONTENT_LENGTH = -1 in mod_cgi (#1276)
   * fixed typecast of NULL on execl() (#1235)
+  * fixed extra Content-Length header on 1xx, 204 and 304 (#1002)
   * fixed mysql server reconnects (#518)
 

trunk/src/response.c

@@ -49 +49 @@
         if (con->response.transfer_encoding & HTTP_TRANSFER_ENCODING_CHUNKED) {
                 response_header_overwrite(srv, con, CONST_STR_LEN("Transfer-Encoding"), CONST_STR_LEN("chunked"));
+                allow_keep_alive = 1;
+        } else if ((con->http_status >= 100 && con->http_status < 200) ||
+                    con->http_status == 204 ||
+                    con->http_status == 304) {
+                /* 1xx, 204 and 304 never have a content-body -> 
+                 *   never have a Content-Length and are always 
+                 *   able to do keep-alive
+                 */
                 allow_keep_alive = 1;
         } else if (con->response.content_length >= 0) {

trunk/tests/LightyTest.pm

@@ -254 +254 @@
                         (my $k = $_) =~ tr/[A-Z]/[a-z]/;
 
-                        my $no_val = 0;
+                        my $verify_value = 1;
+                        my $key_inverted = 0;
 
                         if (substr($k, 0, 1) eq '+') {
                                 $k = substr($k, 1);
-                                $no_val = 1;
-
-                        }
-
-                        if (!defined $resp_hdr{$k}) {
-                                diag(sprintf("required header '%s' is missing\n", $k));
-                                return -1;
-                        }
-
-                        if ($no_val == 0) {
+                                $verify_value = 0;
+                        } elsif (substr($k, 0, 1) eq '-') {
+                                ## the key should NOT exist
+                                $k = substr($k, 1);
+                                $key_inverted = 1;
+                                $verify_value = 0; ## skip the value check
+                        }
+
+                        if ($key_inverted) {
+                                if (defined $resp_hdr{$k}) {
+                                        diag(sprintf("header '%s' MUST not be set\n", $k));
+                                        return -1;
+                                }
+                        } else {
+                                if (not defined $resp_hdr{$k}) {
+                                        diag(sprintf("required header '%s' is missing\n", $k));
+                                        return -1;
+                                }
+                        }
+
+                        if ($verify_value) {
                                 if ($href->{$_} =~ /^\/(.+)\/$/) {
                                         if ($resp_hdr{$k} !~ /$1/) {

trunk/tests/request.t

@@ -9 +9 @@
 use strict;
 use IO::Socket;
-use Test::More tests => 34;
+use Test::More tests => 41;
 use LightyTest;
 
@@ -346 +346 @@
 ok($tf->handle_http($t) == 0, 'HEAD with Content-Length');
 
-
-$t->{REQUEST}  = ( <<EOF
-GET / HTTP/1.0
-If-Modified-Since: Sun, 1970 Jan 01 00:00:01 GMT
-If-Modified-Since: Sun, 1970 Jan 01 00:00:01 GMT
-EOF
- );
-$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ];
+$t->{REQUEST}  = ( <<EOF
+GET / HTTP/1.0
+If-Modified-Since: Sun, 01 Jan 2100 00:00:02 GMT
+If-Modified-Since: Sun, 01 Jan 2100 00:00:02 GMT
+EOF
+ );
+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 304} ];
 ok($tf->handle_http($t) == 0, 'Duplicate If-Mod-Since, with equal timestamps');
 
+$t->{REQUEST}  = ( "GET / HTTP/1.0\r\nIf-Modified-Since: \0\r\n\r\n" );
+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 400 } ];
+ok($tf->handle_http($t) == 0, 'invalid chars in Header values (bug #1286)');
+
+$t->{REQUEST}  = ( "GET / HTTP/1.0\r\nIf-Modified-Since: \r\n\r\n" );
+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ];
+ok($tf->handle_http($t) == 0, 'empty If-Modified-Since');
+
+$t->{REQUEST}  = ( "GET / HTTP/1.0\r\nIf-Modified-Since: foobar\r\n\r\n" );
+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ];
+ok($tf->handle_http($t) == 0, 'broken If-Modified-Since');
+
+$t->{REQUEST}  = ( "GET / HTTP/1.0\r\nIf-Modified-Since: this string is too long to be a valid timestamp\r\n\r\n" );
+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ];
+ok($tf->handle_http($t) == 0, 'broken If-Modified-Since');
+
+
+$t->{REQUEST}  = ( <<EOF
+GET /index.html HTTP/1.0
+If-Modified-Since2: Sun, 01 Jan 2100 00:00:03 GMT
+If-Modified-Since: Sun, 01 Jan 2100 00:00:02 GMT
+EOF
+ );
+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 304 } ];
+ok($tf->handle_http($t) == 0, 'Similar Headers (bug #1287)');
+
+$t->{REQUEST}  = ( <<EOF
+GET /index.html HTTP/1.0
+If-Modified-Since: Sun, 01 Jan 2100 00:00:02 GMT
+EOF
+ );
+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 304, 'Content-Type' => 'text/html' } ];
+ok($tf->handle_http($t) == 0, 'If-Modified-Since');
+
+$t->{REQUEST}  = ( <<EOF
+GET /index.html HTTP/1.0
+If-Modified-Since: Sun, 01 Jan 2100 00:00:02 GMT
+EOF
+ );
+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 304, '-Content-Length' => '' } ];
+ok($tf->handle_http($t) == 0, 'Status 304 has no Content-Length (#1002)');
+
 ok($tf->stop_proc == 0, "Stopping lighttpd");