From: Jim Jagielski <jim@apache.org>
Date: Mon, 4 May 2009 20:40:20 +0000 (+0000)
Subject: Merge r680082 from trunk:
X-Git-Tag: 2.2.12~145
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84c90670c018127fdb22e6f423b35961d5fd993b;p=thirdparty%2Fapache%2Fhttpd.git

Merge r680082 from trunk:

Change r->content_type when mod_headers sets the Content-Type header
Submitted by: issac
Reviewed/backported by: jim


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

diff --git a/modules/metadata/mod_headers.c b/modules/metadata/mod_headers.c
index 8e748fa9d74..b65fbfd0771 100644
--- a/modules/metadata/mod_headers.c
+++ b/modules/metadata/mod_headers.c
@@ -680,6 +680,9 @@ static void do_headers_fixup(request_rec *r, apr_table_t *headers,
             }
             break;
         case hdr_set:
+            if (!strcasecmp(hdr->header, "Content-Type")) {
+                 ap_set_content_type(r, process_tags(hdr, r));
+            }
             apr_table_setn(headers, hdr->header, process_tags(hdr, r));
             break;
         case hdr_unset: