Changeset 1683

Timestamp:

02/21/2007 06:15:47 AM (19 months ago)

Author:

jakabosky

Message:

fixed bug with Content-Length = 0, when backend sent Content-Length > 0

Location:

trunk/src

Files:

• mod_chunked.c (modified) (1 diff)
• mod_proxy_backend_http.c (modified) (1 diff)
• mod_proxy_backend_scgi.c (modified) (1 diff)
• mod_proxy_core.c (modified) (2 diffs)

trunk/src/mod_chunked.c

@@ -200 +200 @@
         /* check if response needs chunked encoding. */
         if(in->is_closed) {
-                if (p->conf.debug > 0) TRACE("%s", "response content finished disable chunked encoding");
                 con->response.content_length = chunkqueue_length(in);
+        }
+        if(con->response.content_length >= 0) {
+                if (p->conf.debug > 0) TRACE("response content length known, disabling chunked encoding.  len=%d", con->response.content_length);
                 use_chunked = 0;
         } else if (con->request.http_method != HTTP_METHOD_HEAD) {

trunk/src/mod_proxy_backend_http.c

@@ -230 +230 @@
 
         if (in->first == NULL) {
-                if ((sess->content_length > 0 && sess->bytes_read == sess->content_length) || in->is_closed) {
+                if ((sess->content_length >= 0 && sess->bytes_read == sess->content_length) || in->is_closed) {
                         sess->is_request_finished = 1;
                         return HANDLER_FINISHED;

trunk/src/mod_proxy_backend_scgi.c

@@ -335 +335 @@
 
         if (in->first == NULL) {
-                if ((sess->content_length > 0 && sess->bytes_read == sess->content_length) || in->is_closed) {
+                if ((sess->content_length >= 0 && sess->bytes_read == sess->content_length) || in->is_closed) {
                         sess->is_request_finished = 1;
                         return HANDLER_FINISHED;

trunk/src/mod_proxy_core.c

@@ -450 +450 @@
 
         sess->is_chunked = 0;
+        sess->content_length = -1;
         sess->send_response_content = 1;
         sess->do_new_session = 0;
@@ -477 +478 @@
         sess->bytes_read = 0;
         sess->connect_start_ts = 0;
-        sess->content_length = 0;
+        sess->content_length = -1;
         sess->internal_redirect_count = 0;
         sess->do_internal_redirect = 0;