Changeset 2098

Timestamp:

02/27/2008 12:15:38 PM (6 months ago)

Author:

stbuehler

Message:

Fix Content-Length header if response body gets removed in connections.c (#1412, part 2)

• do not touch if it is a HEAD request (but set file_finished)
• body gets removed for req method OPTION and some status codes

Location:

branches/lighttpd-1.4.x

Files:

• NEWS (modified) (1 diff)
• src/connections.c (modified) (5 diffs)

branches/lighttpd-1.4.x/NEWS

@@ -41 +41 @@
   * fixed mod-proxy.t to run with a builddir outside of the src dir
   * do not suppress content on "307 Temporary Redirect" (#1412)
+  * fixed Content-Length header if response body gets removed in connections.c (#1412, part 2)
 
 - 1.4.18 - 2007-09-09

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

@@ -399 +399 @@
                                 response_header_insert(srv, con, CONST_STR_LEN("Allow"), CONST_STR_LEN("OPTIONS, GET, HEAD, POST"));
 
+                                con->response.transfer_encoding &= ~HTTP_TRANSFER_ENCODING_CHUNKED;
+                                con->parsed_response &= ~HTTP_CONTENT_LENGTH;
+
                                 con->http_status = 200;
                                 con->file_finished = 1;
@@ -513 +516 @@
                 /* disable chunked encoding again as we have no body */
                 con->response.transfer_encoding &= ~HTTP_TRANSFER_ENCODING_CHUNKED;
+                con->parsed_response &= ~HTTP_CONTENT_LENGTH;
                 chunkqueue_reset(con->write_queue);
 
@@ -518 +522 @@
                 break;
         }
-
 
         if (con->file_finished) {
@@ -538 +541 @@
                             con->http_status == 204 ||
                             con->http_status == 304) {
+                                data_string *ds;
                                 /* no Content-Body, no Content-Length */
+                                if (NULL != (ds = (data_string*) array_get_element(con->response.headers, "Content-Length"))) {
+                                        buffer_reset(ds->value); // Headers with empty values are ignored for output
+                                }
                         } else if (qlen >= 0) {
                                 /* qlen = 0 is important for Redirects (301, ...) as they MAY have
@@ -584 +591 @@
                  * without the content
                  */
+                con->file_finished = 1;
+
                 chunkqueue_reset(con->write_queue);
                 con->response.transfer_encoding &= ~HTTP_TRANSFER_ENCODING_CHUNKED;