mod_cache: Make option "CacheDisable" in mod_cache case insensitive PR 54462

trunk patch: http://svn.apache.org/r1464721
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@1490581 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 3b6e851714efb0a7b67d1f39e0daf7cc9d5822f3..30855c2d13e5fbf5fe3e1951eb320ae45f6bdd8f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 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_cache: If a 304 response indicates an entity not currently cached, then
      the cache MUST disregard the response and repeat the request without the
      conditional. [Graham Leggett, Co-Advisor <coad measurement-factory.com>]

diff --git a/STATUS b/STATUS
index d11693980763d36ca0d9f54e5f56e358b815941a..b918b288913a14666d78c510c827e86b27eaae53 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_cache: Make option "CacheDisable" in mod_cache case insensitive
-      PR 54462 reported by Tianyin Xu [tixu cs ucsd edu]
-      trunk patch: http://svn.apache.org/r1464721
-      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/cache/mod_cache.c b/modules/cache/mod_cache.c
index 513448a5837f7fe751cf0f6cb840333b1791a647..d991709b556edcde52e6815c5b1a2874a48fe0dd 100644 (file)
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -2264,7 +2264,7 @@ static const char *add_cache_disable(cmd_parms *parms, void *dummy,
                                                   &cache_module);
 
     if (parms->path) {
-        if (!strcmp(url, "on")) {
+        if (!strcasecmp(url, "on")) {
             dconf->disable = 1;
             dconf->disable_set = 1;
             return NULL;