From: William A. Rowe Jr <wrowe@apache.org>
Date: Thu, 22 Dec 2016 18:45:07 +0000 (+0000)
Subject: Backports: r1057372
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e486b5ada0856bf63c55a4c9f39a0dcba165ee79;p=thirdparty%2Fapache%2Fhttpd.git

Backports: r1057372
Submitted by: trawick
comment on where multiple headers with same name get merged

(some strict Cookie parsers can't handle what happens later,
but that is not our fault)



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775695 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/protocol.c b/server/protocol.c
index f1683295682..f20f315269f 100644
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -863,6 +863,9 @@ AP_DECLARE(void) ap_get_mime_headers_core(request_rec *r, apr_bucket_brigade *bb
         }
     }
 
+    /* Combine multiple message-header fields with the same
+     * field-name, following RFC 2616, 4.2.
+     */
     apr_table_compress(r->headers_in, APR_OVERLAP_TABLES_MERGE);
 }