Changeset 1985

Timestamp:

09/06/2007 11:24:20 AM (12 months ago)

Author:

jan

Message:

* fixed hanging redirects with keep-alive due to missing

"Content-Length: 0" headers

Location:

branches/lighttpd-1.4.x

Files:

• NEWS (modified) (1 diff)
• src/connections.c (modified) (1 diff)
• tests/mod-redirect.t (modified) (2 diffs)

branches/lighttpd-1.4.x/NEWS

@@ -8 +8 @@
   * fixed forwarding a SIGINT and SIGHUP when using max-workers (#902)
   * fixed FastCGI header overrun in mod_fastcgi (reported by mattias@secweb.se)
+  * fixed hanging redirects with keep-alive due to missing 
+    "Content-Length: 0" headers
 
 

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

@@ -538 +538 @@
                             con->http_status == 304) {
                                 /* no Content-Body, no Content-Length */
-                        } else if (qlen > 0) {
+                        } else if (qlen >= 0) {
+                                /* qlen = 0 is important for Redirects (301, ...) as they MAY have
+                                 * a content. Browsers are waiting for a Content otherwise
+                                 */
                                 buffer_copy_off_t(srv->tmp_buf, chunkqueue_length(con->write_queue));
 

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

@@ -9 +9 @@
 use strict;
 use IO::Socket;
-use Test::More tests => 6;
+use Test::More tests => 7;
 use LightyTest;
 
@@ -24 +24 @@
 $t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 301, 'Location' => 'http://localhost:'.$tf->{PORT}.'/' } ];
 ok($tf->handle_http($t) == 0, 'external redirect');
+
+$t->{REQUEST}  = ( <<EOF
+GET /redirect/ HTTP/1.0
+Host: vvv.example.org
+EOF
+ );
+$t->{RESPONSE} = [ { 'HTTP-Protocol' => 'HTTP/1.0', 'HTTP-Status' => 301, 'Location' => 'http://localhost:'.$tf->{PORT}.'/', 'Content-Length' => '0' } ];
+ok($tf->handle_http($t) == 0, 'external redirect should have a Content-Length: 0');
 
 $t->{REQUEST} = ( <<EOF