~ubuntu-branches/ubuntu/dapper/apache2/dapper

diff -ruN -x configure -x '*~' -x build-tree.orig -x '*.rej' build-tree.orig/apache2/modules/proxy/proxy_http.c build-tree/apache2/modules/proxy/proxy_http.c

--- build-tree.orig/apache2/modules/proxy/proxy_http.c  2005-02-04 20:21:18.000000000 +0000

+++ build-tree/apache2/modules/proxy/proxy_http.c       2005-08-02 09:25:21.000000000 +0000

@@ -768,8 +768,24 @@

                 return r->status;

 

             } else {

-                /* strip connection listed hop-by-hop headers from response */

                 const char *buf;

+

+                /* can't have both Content-Length and Transfer-Encoding */

+                if (apr_table_get(r->headers_out, "Transfer-Encoding")

+                    && apr_table_get(r->headers_out, "Content-Length")) {

+                    /* 2616 section 4.4, point 3: "if both Transfer-Encoding

+                     * and Content-Length are received, the latter MUST be

+                     * ignored"; so unset it here to prevent any confusion

+                     * later. */

+                    apr_table_unset(r->headers_out, "Content-Length");

+                    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,

+                                 r->server,

+                                 "proxy: server %s returned Transfer-Encoding and Content-Length",

+                                 p_conn->name);

+                    p_conn->close += 1;

+                }

+                

+                /* strip connection listed hop-by-hop headers from response */

                 p_conn->close += ap_proxy_liststr(apr_table_get(r->headers_out,

                                                                 "Connection"),

                                                   "close");

diff -ruN -x configure -x '*~' -x build-tree.orig -x '*.rej' build-tree.orig/apache2/server/protocol.c build-tree/apache2/server/protocol.c

--- build-tree.orig/apache2/server/protocol.c   2005-08-02 09:25:38.000000000 +0000

+++ build-tree/apache2/server/protocol.c        2005-08-02 09:25:12.000000000 +0000

@@ -885,6 +885,15 @@

             apr_brigade_destroy(tmp_bb);

             return r;

         }

+

+        if (apr_table_get(r->headers_in, "Transfer-Encoding")

+            && apr_table_get(r->headers_in, "Content-Length")) {

+            /* 2616 section 4.4, point 3: "if both Transfer-Encoding

+             * and Content-Length are received, the latter MUST be

+             * ignored"; so unset it here to prevent any confusion

+             * later. */

+            apr_table_unset(r->headers_in, "Content-Length");

+        }

     }

     else {

         if (r->header_only) {