From: Rainer Jung <rjung@apache.org>
Date: Wed, 19 Jun 2013 12:55:56 +0000 (+0000)
Subject: mod_cache_socache: Fix warning "variable 'rv' may
X-Git-Tag: 2.4.5~92
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a2b3382d36bdce8c7f81345869090df244008fc;p=apache

mod_cache_socache: Fix warning "variable 'rv' may
be used uninitialized in this function"
(which is correct here).

Backport of r1494536 form trunk.


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

diff --git a/STATUS b/STATUS
index f4ee190915..de89992db4 100644
--- a/STATUS
+++ b/STATUS
@@ -90,12 +90,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    * mod_cache_socache: Fix warning "variable 'rv' may be used uninitialized
-      in this function" (which is correct here).
-      trunk patch: http://svn.apache.org/r1494536
-      2.4.x patch: trunk patch works
-      +1: rjung, minfrin, fuankg
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/modules/cache/mod_cache_socache.c b/modules/cache/mod_cache_socache.c
index b969bc68f6..7be264adce 100644
--- a/modules/cache/mod_cache_socache.c
+++ b/modules/cache/mod_cache_socache.c
@@ -1420,7 +1420,7 @@ static int socache_post_config(apr_pool_t *pconf, apr_pool_t *plog,
                 &conf->provider->socache_instance, conf->provider->args, ptmp,
                 pconf);
         if (errmsg) {
-            ap_log_perror(APLOG_MARK, APLOG_CRIT, rv, plog,
+            ap_log_perror(APLOG_MARK, APLOG_CRIT, 0, plog,
                     APLOGNO(02392) "%s", errmsg);
             return 500; /* An HTTP status would be a misnomer! */
         }