From: Ruediger Pluem <rpluem@apache.org>
Date: Thu, 22 Mar 2012 15:15:26 +0000 (+0000)
Subject: * Partly revert r1303435 and rename pconf back to in_pconf to avoid shadowing
X-Git-Tag: 2.5.0-alpha~7325
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b794edf6873015ee2f412605d2d1dc2dbbe137ce;p=apache

* Partly revert r1303435 and rename pconf back to in_pconf to avoid shadowing
  the global variable with the same name and create a bogus assignment.

Pointed out by: Eric Covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1303827 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/include/mpm_common.h b/include/mpm_common.h
index 2a608f7b33..99b1945c96 100644
--- a/include/mpm_common.h
+++ b/include/mpm_common.h
@@ -162,7 +162,7 @@ AP_DECLARE(apr_status_t) ap_mpm_safe_kill(pid_t pid, int sig);
  */
 AP_DECLARE(int) ap_process_child_status(apr_proc_t *pid, apr_exit_why_e why, int status);
 
-AP_DECLARE(apr_status_t) ap_fatal_signal_setup(server_rec *s, apr_pool_t *pconf);
+AP_DECLARE(apr_status_t) ap_fatal_signal_setup(server_rec *s, apr_pool_t *in_pconf);
 AP_DECLARE(apr_status_t) ap_fatal_signal_child_setup(server_rec *s);
 #endif /* !NETWARE */
 
diff --git a/server/mpm_unix.c b/server/mpm_unix.c
index e8eeb0713e..87df8f57a9 100644
--- a/server/mpm_unix.c
+++ b/server/mpm_unix.c
@@ -877,7 +877,7 @@ AP_DECLARE(apr_status_t) ap_fatal_signal_child_setup(server_rec *s)
 }
 
 AP_DECLARE(apr_status_t) ap_fatal_signal_setup(server_rec *s,
-                                               apr_pool_t *pconf)
+                                               apr_pool_t *in_pconf)
 {
 #ifndef NO_USE_SIGACTION
     struct sigaction sa;
@@ -937,7 +937,7 @@ AP_DECLARE(apr_status_t) ap_fatal_signal_setup(server_rec *s,
 
 #endif /* NO_USE_SIGACTION */
 
-    pconf = pconf;
+    pconf = in_pconf;
     parent_pid = my_pid = getpid();
 
     return APR_SUCCESS;