From: Jim Jagielski <jim@apache.org>
Date: Tue, 17 Sep 2013 19:44:08 +0000 (+0000)
Subject: Update rationale
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4860528144938b118b16d1ba91310dad97c5ad09;p=thirdparty%2Fapache%2Fhttpd.git

Update rationale


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1524192 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/protocol.c b/server/protocol.c
index c1ecae705bc..f011656b09a 100644
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -1104,10 +1104,12 @@ request_rec *ap_read_request(conn_rec *conn)
 
         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. */
+            /* http://tools.ietf.org/html/draft-ietf-httpbis-p1-messaging-23#page-31
+             * "If a message is received with both a Transfer-Encoding and a
+             * Content-Length header field, the Transfer-Encoding overrides the
+             * Content-Length. ... A sender MUST remove the received Content-
+             * Length field"
+             */
             apr_table_unset(r->headers_in, "Content-Length");
         }
     }