Changeset 2099

Timestamp:

02/27/2008 06:35:42 PM (5 months ago)

Author:

stbuehler

Message:

r2123@chromobil: stefan | 2008-02-27 19:30:54 +0100
do not generate a "Content-Length: 0" header for HEAD requests, added test too

Files:

• branches/lighttpd-1.4.x/NEWS (modified) (1 diff)
• branches/lighttpd-1.4.x/src/connections.c (modified) (1 diff)
• branches/lighttpd-1.4.x/tests/mod-fastcgi.t (modified) (3 diffs)

branches/lighttpd-1.4.x/NEWS

@@ -42 +42 @@
-  * do not suppress content on "307 Temporary Redirect" (#1412)
-  * fixed Content-Length header if response body gets removed in connections.c (#1412, part 2)
+  * do not generate a "Content-Length: 0" header for HEAD requests, added test too
-
-- 1.4.18 - 2007-09-09

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

@@ -546 +546 @@
-                                        buffer_reset(ds->value); // Headers with empty values are ignored for output
-                                }
-= 0
+ 0 || con->request.http_method != HTTP_METHOD_HEAD
-                                /* qlen = 0 is important for Redirects (301, ...) as they MAY have
-                                 * a content. Browsers are waiting for a Content otherwise
-                                 */
-chunkqueue_length(con->write_queue)
+qlen
-
-                                response_header_overwrite(srv, con, CONST_STR_LEN("Content-Length"), CONST_BUF_LEN(srv->tmp_buf));

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

@@ -8 +8 @@
-
-use strict;
-6
+7
-use LightyTest;
-
@@ -224 +224 @@
-
-SKIP: {
-4
+5
-        $tf->{CONFIGFILE} = 'fastcgi-13.conf';
-        ok($tf->start_proc == 0, "Starting lighttpd with $tf->{CONFIGFILE}") or die();
@@ -234 +234 @@
-        $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200 } ];
-        ok($tf->handle_http($t) == 0, 'FastCGI + local spawning');
+
+        $t->{REQUEST} = ( <<EOF
+HEAD /indexfile/index.php HTTP/1.0
+Host: www.example.org
+EOF
+ );
+        $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 200, '-Content-Length' => '0' } ];
+        # Of course a valid content-length != 0 would be ok, but we assume for now that such one is not generated.
+        ok($tf->handle_http($t) == 0, 'Check for buggy content length with HEAD');
-
-        $t->{REQUEST}  = ( <<EOF