From: Jeff Trawick <trawick@apache.org>
Date: Wed, 14 May 2014 10:47:09 +0000 (+0000)
Subject: Merge r1583007 from trunk:
X-Git-Tag: 2.4.10~239
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3bd6798c688509be21c8093453b1d04ade934ac2;p=apache

Merge r1583007 from trunk:

mod_authn_socache: fix logging of bogus rv in r1576233

Submitted by: trawick
Reviewed by: jim, ylavic


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

diff --git a/STATUS b/STATUS
index 0753a8f2be..9cce4a179e 100644
--- a/STATUS
+++ b/STATUS
@@ -106,11 +106,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: http://people.apache.org/~covener/patches/httpd-2.4.x-aliasmatch_contextinfo.diff
      +1 covener, jim, ylavic
 
-   * mod_authn_socache: fix logging of bugus rv in r1576233 (now in 2.4.x)
-     trunk patch: http://svn.apache.org/r1583007
-     2.4.x patch: trunk patch works
-     +1: trawick, jim, ylavic
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/modules/aaa/mod_authn_socache.c b/modules/aaa/mod_authn_socache.c
index 597ac863ed..140f3b7dff 100644
--- a/modules/aaa/mod_authn_socache.c
+++ b/modules/aaa/mod_authn_socache.c
@@ -107,7 +107,7 @@ static int authn_cache_post_config(apr_pool_t *pconf, apr_pool_t *plog,
         errmsg = socache_provider->create(&socache_instance, NULL,
                                           ptmp, pconf);
         if (errmsg) {
-            ap_log_perror(APLOG_MARK, APLOG_CRIT, rv, plog, APLOGNO(02612)
+            ap_log_perror(APLOG_MARK, APLOG_CRIT, 0, plog, APLOGNO(02612)
                         "failed to create mod_socache_shmcb socache "
                         "instance: %s", errmsg);
             return 500;