VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-13 14:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Partly revert r1303435 and rename pconf back to in_pconf to avoid shadowing

Browse Source 
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
This commit is contained in:
Ruediger Pluem
2012-03-22 15:15:26 +00:00
parent d70a27acff
commit b794edf687
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/mpm_unix.c
View File

@ -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;