diff options
| author | Jim Jagielski <jim@apache.org> | 2009-09-25 13:59:30 +0200 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2009-09-25 13:59:30 +0200 |
| commit | 83532ab6284ee5d0db23f2368d315a6c788975f0 (patch) | |
| tree | 7ab48ab6ec9bc75e7895292ae74bbda5a934f8f4 /server/mpm/prefork | |
| parent | update transformation (diff) | |
| download | apache2-83532ab6284ee5d0db23f2368d315a6c788975f0.tar.xz apache2-83532ab6284ee5d0db23f2368d315a6c788975f0.zip | |
Enhance ap_hook_monitor to pass along a server_rec (in
general the ap_server_conf) and tuck away some storage
in there which may be useful as an opaque data pointer.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@818825 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/mpm/prefork')
| -rw-r--r-- | server/mpm/prefork/prefork.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c index 9b30635fc8..91d8ae81bb 100644 --- a/server/mpm/prefork/prefork.c +++ b/server/mpm/prefork/prefork.c @@ -1002,7 +1002,7 @@ static int prefork_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) /* this is a memory leak, but I'll fix it later. */ apr_proc_t pid; - ap_wait_or_timeout(&exitwhy, &status, &pid, pconf); + ap_wait_or_timeout(&exitwhy, &status, &pid, pconf, ap_server_conf); /* XXX: if it takes longer than 1 second for all our children * to start up and get into IDLE state then we may spawn an |