From c3ffaf0849582c679e642a8d48df18c20f882bfc Mon Sep 17 00:00:00 2001 From: Christophe Jaillet Date: Fri, 4 Apr 2014 19:59:06 +0000 Subject: [PATCH] Do not delete the wrong data from HTML code when a "http-equiv" meta tag specifies a Content-Type behind any other "http-equiv" meta tag. PR 56287 [Micha Lenk ] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1584878 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 4 ++++ modules/filters/mod_proxy_html.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 7f2337fdac9..7be717ea1f0 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,10 @@ -*- coding: utf-8 -*- Changes with Apache 2.5.0 + *) mod_proxy_html: Do not delete the wrong data from HTML code when a + "http-equiv" meta tag specifies a Content-Type behind any other + "http-equiv" meta tag. PR 56287 [Micha Lenk ] + *) mod_expires: don't add Expires header to error responses (4xx/5xx), be they generated or forwarded. PR 55669. [ Yann Ylavic ] diff --git a/modules/filters/mod_proxy_html.c b/modules/filters/mod_proxy_html.c index 523c0bf4f5c..081f37122a5 100644 --- a/modules/filters/mod_proxy_html.c +++ b/modules/filters/mod_proxy_html.c @@ -688,8 +688,8 @@ static meta *metafix(request_rec *r, const char *buf) } else if (!strncasecmp(header, "Content-Type", 12)) { ret = apr_palloc(r->pool, sizeof(meta)); - ret->start = pmatch[0].rm_so; - ret->end = pmatch[0].rm_eo; + ret->start = offs+pmatch[0].rm_so; + ret->end = offs+pmatch[0].rm_eo; } if (header && content) { #ifndef GO_FASTER -- 2.47.3