You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2013/06/07 12:56:03 UTC

svn commit: r1490581 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS modules/cache/mod_cache.c

Author: minfrin
Date: Fri Jun  7 10:56:02 2013
New Revision: 1490581

URL: http://svn.apache.org/r1490581
Log:
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

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/cache/mod_cache.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1464721

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1490581&r1=1490580&r2=1490581&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Fri Jun  7 10:56:02 2013
@@ -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>]

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1490581&r1=1490580&r2=1490581&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Fri Jun  7 10:56:02 2013
@@ -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 ]

Modified: httpd/httpd/branches/2.4.x/modules/cache/mod_cache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cache/mod_cache.c?rev=1490581&r1=1490580&r2=1490581&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/cache/mod_cache.c (original)
+++ httpd/httpd/branches/2.4.x/modules/cache/mod_cache.c Fri Jun  7 10:56:02 2013
@@ -2264,7 +2264,7 @@ static const char *add_cache_disable(cmd
                                                   &cache_module);
 
     if (parms->path) {
-        if (!strcmp(url, "on")) {
+        if (!strcasecmp(url, "on")) {
             dconf->disable = 1;
             dconf->disable_set = 1;
             return NULL;