httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1492202 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS modules/cache/mod_cache_socache.c
Date Wed, 12 Jun 2013 13:41:10 GMT
Author: jim
Date: Wed Jun 12 13:41:09 2013
New Revision: 1492202

URL: http://svn.apache.org/r1492202
Log:
Merge r1491458 from trunk:

mod_cache_socache: Use the name of the socache implementation when performing 
a lookup rather than using the raw arguments.

Submitted by: minfrin
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/cache/mod_cache_socache.c

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

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1492202&r1=1492201&r2=1492202&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Wed Jun 12 13:41:09 2013
@@ -2,6 +2,10 @@
 
 Changes with Apache 2.4.5
 
+  *) mod_cache_socache: Use the name of the socache implementation when performing
+     a lookup rather than using the raw arguments. [Martin Ksellmann
+     <martin@ksellmann.de>]
+
   *) core: Add dirwalk_stat hook.  [Jeff Trawick]
 
   *) core: Add post_perdir_config hook.

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1492202&r1=1492201&r2=1492202&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed Jun 12 13:41:09 2013
@@ -95,13 +95,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
 
-    * mod_cache_socache: Use the name of the socache implementation when performing 
-      a lookup rather than using the raw arguments. PR 55062
-      trunk patch: http://svn.apache.org/r1491458
-      2.4.x patch: trunk patch works
-      +1: minfrin, rjung, jim
-
-
 
   * mod_auth_basic: Add a generic mechanism to fake basic authentication
     using the ap_expr parser. This allows the administrator to construct

Modified: httpd/httpd/branches/2.4.x/modules/cache/mod_cache_socache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cache/mod_cache_socache.c?rev=1492202&r1=1492201&r2=1492202&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/cache/mod_cache_socache.c (original)
+++ httpd/httpd/branches/2.4.x/modules/cache/mod_cache_socache.c Wed Jun 12 13:41:09 2013
@@ -1273,7 +1273,7 @@ static const char *set_cache_socache(cmd
     }
 
     provider->socache_provider = ap_lookup_provider(AP_SOCACHE_PROVIDER_GROUP,
-            arg, AP_SOCACHE_PROVIDER_VERSION);
+            name, AP_SOCACHE_PROVIDER_VERSION);
     if (provider->socache_provider == NULL) {
         err = apr_psprintf(cmd->pool,
                 "Unknown socache provider '%s'. Maybe you need "



Mime
View raw message