From: Jim Jagielski <jim@apache.org>
Date: Wed, 12 Jun 2013 13:41:09 +0000 (+0000)
Subject: Merge r1491458 from trunk:
X-Git-Tag: 2.4.5~129
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=03f38181b475e7457b691b040ba769f4c82a0a78;p=apache

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1492202 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 056d401868..487336a434 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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.
diff --git a/STATUS b/STATUS
index 0da7d19a1a..cce52f8ea4 100644
--- a/STATUS
+++ b/STATUS
@@ -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
diff --git a/modules/cache/mod_cache_socache.c b/modules/cache/mod_cache_socache.c
index e6a4c4d992..b969bc68f6 100644
--- a/modules/cache/mod_cache_socache.c
+++ b/modules/cache/mod_cache_socache.c
@@ -1273,7 +1273,7 @@ static const char *set_cache_socache(cmd_parms *cmd, void *in_struct_ptr,
     }
 
     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 "