diff options
| author | Paul J. Reder <rederpj@apache.org> | 2001-08-20 21:47:52 +0200 |
|---|---|---|
| committer | Paul J. Reder <rederpj@apache.org> | 2001-08-20 21:47:52 +0200 |
| commit | c8698ef0dbbc7250d1f54caf1cdefe2b7588d691 (patch) | |
| tree | a24f2e503d8108cd293075477eeb619d5a781ab4 /server/mpm/prefork | |
| parent | *) Changed the late-1.3 log_config substitution %c to %X (logs the (diff) | |
| download | apache2-c8698ef0dbbc7250d1f54caf1cdefe2b7588d691.tar.xz apache2-c8698ef0dbbc7250d1f54caf1cdefe2b7588d691.zip | |
The prefork and OS/2 MPMs are overwriting the pid file when a second copy
of httpd is started and shuts down due to socket conflict. Moving the
call to ap_log_pid solves the problem.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90418 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/mpm/prefork')
| -rw-r--r-- | server/mpm/prefork/prefork.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c index 9c35747366..4e7476e30b 100644 --- a/server/mpm/prefork/prefork.c +++ b/server/mpm/prefork/prefork.c @@ -1110,12 +1110,13 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) ap_server_conf = s; - ap_log_pid(pconf, ap_pid_fname); - if (setup_listeners(s)) { /* XXX: hey, what's the right way for the mpm to indicate a fatal error? */ return 1; } + + ap_log_pid(pconf, ap_pid_fname); + if ((rv = ap_mpm_pod_open(pconf, &pod))) { ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s, "Could not open pipe-of-death."); |