Changeset 1537

Timestamp:

01/28/2007 12:13:31 AM (21 months ago)

Author:

jan

Message:

moved the reset of the content-queue right before we write the content
to the network as all filters might want to know if there was content
and set the Content-Length accordingly.

Location:

trunk/src

Files:

• connections.c (modified) (3 diffs)
• mod_chunked.c (modified) (1 diff)

trunk/src/connections.c

@@ -333 +333 @@
         }
 
-        if (con->request.http_method == HTTP_METHOD_HEAD) {
-                no_response_body = 1;
-        }
-
         if (no_response_body) {
                 /* disable chunked encoding again as we have no body */
@@ -1234 +1230 @@
                         }
 
+                        /* all the response-headers are set, check if we have a */
+
                         connection_set_state(srv, con, CON_STATE_WRITE_RESPONSE_HEADER);
 
@@ -1242 +1240 @@
 
                         connection_set_state(srv, con, CON_STATE_WRITE_RESPONSE_CONTENT);
+
+                        if (con->request.http_method == HTTP_METHOD_HEAD) {
+                                /* remove the content now */
+                                chunkqueue_reset(con->send);
+
+                                con->send->is_closed = 1;
+                        }
 
                         break;

trunk/src/mod_chunked.c

@@ -203 +203 @@
                 con->response.content_length = chunkqueue_length(in);
                 use_chunked = 0;
-        } else {
+        } else if (con->request.http_method != HTTP_METHOD_HEAD) {
+                /* a HEAD request never gets a chunk-encoding, but might stay with keep-alive
+                 * in case the queue was closed already (above) we still have the content-length */
+                
                 /* we don't know the size of the content yet
                  * - either enable chunking