diff options
author | Aaron Bannert <aaron@apache.org> | 2002-01-29 03:41:46 +0100 |
---|---|---|
committer | Aaron Bannert <aaron@apache.org> | 2002-01-29 03:41:46 +0100 |
commit | aa71fe9345f6e04345d00ecd1104787cd8f75884 (patch) | |
tree | 4c4fbc665477ea84a1272bef83a11a8e555cc593 /server/mpm/beos | |
parent | Added MOD_Auth_Digest to the build project (diff) | |
download | apache2-aa71fe9345f6e04345d00ecd1104787cd8f75884.tar.xz apache2-aa71fe9345f6e04345d00ecd1104787cd8f75884.zip |
Take advantage of the new pre_config return value when apr_proc_detach
fails. I'll be making some changes to apr_proc_detach, and it will be
nice to be able to report runtime errors.
Tested on worker but the code changes are identical on other MPMs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93069 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/mpm/beos')
-rw-r--r-- | server/mpm/beos/beos.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c index 2f059eae21..b618e364af 100644 --- a/server/mpm/beos/beos.c +++ b/server/mpm/beos/beos.c @@ -996,6 +996,7 @@ static int beos_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptem { static int restart_num = 0; int no_detach, debug; + apr_status_t rv; debug = ap_exists_config_define("DEBUG"); @@ -1011,8 +1012,14 @@ static int beos_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptem if (restart_num++ == 1) { is_graceful = 0; - if (!one_process && !no_detach) - apr_proc_detach(); + if (!one_process && !no_detach) { + rv = apr_proc_detach(); + if (rv != APR_SUCCESS) { + ap_log_error(APLOG_MARK, APLOG_CRIT, rv, NULL, + "apr_proc_detach failed"); + return HTTP_INTERNAL_SERVER_ERROR; + } + } server_pid = getpid(); } |