Merge r1584878 from trunk:

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 <micha lenk info>]
Submitted by: jailletc36
Reviewed/backported by: jim

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

diff --git a/CHANGES b/CHANGES
index 03e189e26eb9b5dd8b06e8aee69d09dd6fca4e48..16e961ebd3e05db7a2bf84c57b85f06a5ee50ded 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
 
 Changes with Apache 2.4.10
 
+  *) 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 <micha lenk info>]
+
   *) mod_lua: Redesign how request record table access behaves,
      in order to utilize the request record from within these tables
      [Daniel Gruno]

diff --git a/STATUS b/STATUS
index c0c72613a92e700c4447680bdb6f8a244f414687..b86823c60c01d18ec2029c6b0d8a7684fa391346 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -127,13 +127,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (modulo CHANGES)
      +1: trawick, jim, ylavic
 
-   * 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 <micha lenk info>]
-     trunk patch: https://svn.apache.org/r1584878
-     2.4.x patch: trunk patch works (modulo CHANGES)
-     +1: jailletc36, jim, ylavic
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/modules/filters/mod_proxy_html.c b/modules/filters/mod_proxy_html.c
index 7a61e1ca81cb287454f56d2e85352ed72ed5496c..ee6a7210638e75712109a8936a53537c56274262 100644 (file)
--- a/modules/filters/mod_proxy_html.c
+++ b/modules/filters/mod_proxy_html.c
@@ -690,8 +690,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