From 65d3f49bac08664f17aec264372977801bf1de21 Mon Sep 17 00:00:00 2001 From: Nick Kew Date: Sat, 26 Dec 2009 23:05:39 +0000 Subject: [PATCH] =?utf8?q?mod=5Fheaders:=20align=20Header=20Edit=20with=20?= =?utf8?q?Header=20Set=20on=20Content-Type=20PR=2048422=20Adapted=20patch?= =?utf8?q?=20from=20Cyril=20Bont=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@894034 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ modules/metadata/mod_headers.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/CHANGES b/CHANGES index a5fba36efc..81e0854f87 100644 --- a/CHANGES +++ b/CHANGES @@ -33,6 +33,9 @@ Changes with Apache 2.3.5 *) Proxy: Fix ProxyPassReverse with relative URL Derived (slightly erroneously) from PR 38864 [Nick Kew] + *) mod_headers: align Header Edit with Header Set when used on Content-Type + PR 48422 [Cyril Bonté , Nick Kew>] + Changes with Apache 2.3.4 *) Replace AcceptMutex, LockFile, RewriteLock, SSLMutex, SSLStaplingMutex, diff --git a/modules/metadata/mod_headers.c b/modules/metadata/mod_headers.c index 2554681042..e27f504ae6 100644 --- a/modules/metadata/mod_headers.c +++ b/modules/metadata/mod_headers.c @@ -722,6 +722,10 @@ static void do_headers_fixup(request_rec *r, apr_table_t *headers, echo_header, (void *) &v, r->headers_in, NULL); break; case hdr_edit: + if (!strcasecmp(hdr->header, "Content-Type") && r->content_type) { + ap_set_content_type(r, process_regexp(hdr, r->content_type, + r->pool)); + } if (apr_table_get(headers, hdr->header)) { edit_do ed; -- 2.50.1