mod_proxy_html: make the "ProxyHTMLFixups" options case insensitive.

PR 54420

trunk patch: http://svn.apache.org/r1464762
Submitted by: Tianyin Xu <tixu cs ucsd edu>
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

diff --git a/CHANGES b/CHANGES
index 30855c2d13e5fbf5fe3e1951eb320ae45f6bdd8f..7d3e82ba62edb4ed9df584814ae38e36dfc9eb79 100644 (file)
--- 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 <tixu cs ucsd edu>]
+  *) mod_proxy_html: make the "ProxyHTMLFixups" options case insensitive.
+     PR 54420 [Tianyin Xu <tixu cs ucsd edu>]
+
+  *) mod_cache: Make option "CacheDisable" in mod_cache case insensitive.
+     PR 54462 [Tianyin Xu <tixu cs ucsd edu>]
 
   *) 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 04430e50d19f9053b3fbebf6373bf70682d500b4..c98d00964df2517e21bf8a76e89c39d9cd4e41dd 100644 (file)
--- 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 59e5ed3e025ebc37085b6ccef50d620195c821c0..3e5170d1c54297b263746f68f90df6e08aa8e53b 100644 (file)
--- 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;