You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2014/04/15 21:12:48 UTC
svn commit: r1587693 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS
modules/filters/mod_proxy_html.c
Author: jim
Date: Tue Apr 15 19:12:47 2014
New Revision: 1587693
URL: http://svn.apache.org/r1587693
Log:
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
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/filters/mod_proxy_html.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1584878
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1587693&r1=1587692&r2=1587693&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Tue Apr 15 19:12:47 2014
@@ -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]
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1587693&r1=1587692&r2=1587693&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Apr 15 19:12:47 2014
@@ -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 ]
Modified: httpd/httpd/branches/2.4.x/modules/filters/mod_proxy_html.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/mod_proxy_html.c?rev=1587693&r1=1587692&r2=1587693&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/filters/mod_proxy_html.c (original)
+++ httpd/httpd/branches/2.4.x/modules/filters/mod_proxy_html.c Tue Apr 15 19:12:47 2014
@@ -690,8 +690,8 @@ static meta *metafix(request_rec *r, con
}
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