From 0c568e32b96112bf183135ec2a8194271a9a93ed Mon Sep 17 00:00:00 2001 From: Graham Leggett Date: Fri, 7 Jun 2013 11:20:06 +0000 Subject: [PATCH] mod_proxy_html: make the "ProxyHTMLFixups" options case insensitive. PR 54420 trunk patch: http://svn.apache.org/r1464762 Submitted by: Tianyin Xu Reviewed by: jailletc36, fuankg, minfrin git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1490589 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 7 +++++-- STATUS | 6 ------ modules/filters/mod_proxy_html.c | 6 +++--- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index 30855c2d13..7d3e82ba62 100644 --- a/CHANGES +++ b/CHANGES @@ -2,8 +2,11 @@ Changes with Apache 2.4.5 - *) mod_cache: Make option "CacheDisable" in mod_cache case insensitive PR - 54462 [Tianyin Xu ] + *) mod_proxy_html: make the "ProxyHTMLFixups" options case insensitive. + PR 54420 [Tianyin Xu ] + + *) mod_cache: Make option "CacheDisable" in mod_cache case insensitive. + PR 54462 [Tianyin Xu ] *) mod_cache: If a 304 response indicates an entity not currently cached, then the cache MUST disregard the response and repeat the request without the diff --git a/STATUS b/STATUS index 04430e50d1..c98d00964d 100644 --- a/STATUS +++ b/STATUS @@ -131,12 +131,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: half of all new stuff, and therefore the +0.5 - I would like to have someone else add a vote too. - * mod_proxy_html: make the "ProxyHTMLFixups" options case insensitive - PR 54420 reported by Tianyin Xu [tixu cs ucsd edu] - trunk patch: http://svn.apache.org/r1464762 - 2.4.x patch: trunk works - +1 jailletc36, fuankg, minfrin - 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 59e5ed3e02..3e5170d1c5 100644 --- a/modules/filters/mod_proxy_html.c +++ b/modules/filters/mod_proxy_html.c @@ -1142,11 +1142,11 @@ static const char *set_flags(cmd_parms *cmd, void *CFG, const char *arg) { proxy_html_conf *cfg = CFG; if (arg && *arg) { - if (!strcmp(arg, "lowercase")) + if (!strcasecmp(arg, "lowercase")) cfg->flags |= NORM_LC; - else if (!strcmp(arg, "dospath")) + else if (!strcasecmp(arg, "dospath")) cfg->flags |= NORM_MSSLASH; - else if (!strcmp(arg, "reset")) + else if (!strcasecmp(arg, "reset")) cfg->flags |= NORM_RESET; } return NULL; -- 2.40.0