httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rpl...@apache.org
Subject svn commit: r1303827 - in /httpd/httpd/trunk: include/mpm_common.h server/mpm_unix.c
Date Thu, 22 Mar 2012 15:15:27 GMT
Author: rpluem
Date: Thu Mar 22 15:15:26 2012
New Revision: 1303827

URL: http://svn.apache.org/viewvc?rev=1303827&view=rev
Log:
* 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.

Modified:
    httpd/httpd/trunk/include/mpm_common.h
    httpd/httpd/trunk/server/mpm_unix.c

Modified: httpd/httpd/trunk/include/mpm_common.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/mpm_common.h?rev=1303827&r1=1303826&r2=1303827&view=diff
==============================================================================
--- httpd/httpd/trunk/include/mpm_common.h (original)
+++ httpd/httpd/trunk/include/mpm_common.h Thu Mar 22 15:15:26 2012
@@ -162,7 +162,7 @@ AP_DECLARE(apr_status_t) ap_mpm_safe_kil
  */
 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 */
 

Modified: httpd/httpd/trunk/server/mpm_unix.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm_unix.c?rev=1303827&r1=1303826&r2=1303827&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm_unix.c (original)
+++ httpd/httpd/trunk/server/mpm_unix.c Thu Mar 22 15:15:26 2012
@@ -877,7 +877,7 @@ AP_DECLARE(apr_status_t) ap_fatal_signal
 }
 
 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
 
 #endif /* NO_USE_SIGACTION */
 
-    pconf = pconf;
+    pconf = in_pconf;
     parent_pid = my_pid = getpid();
 
     return APR_SUCCESS;



Mime
View raw message