From: Greg Ames Date: Fri, 6 May 2005 20:37:05 +0000 (+0000) Subject: missed a couple. X-Git-Tag: 2.1.5~128 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e06eaebac5bb6bd447742837610fa1e49d9689c7;p=thirdparty%2Fapache%2Fhttpd.git missed a couple. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@168649 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/server/mpm/experimental/event/event.c b/server/mpm/experimental/event/event.c index 194cedd6bc8..ce09103a4d2 100644 --- a/server/mpm/experimental/event/event.c +++ b/server/mpm/experimental/event/event.c @@ -1439,11 +1439,8 @@ static void child_main(int child_num_arg) if (rv != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_ALERT, rv, ap_server_conf, "apr_thread_create: unable to create worker thread"); - /* In case system resources are maxxed out, we don't want - Apache running away with the CPU trying to fork over and - over and over again if we exit. */ - apr_sleep(apr_time_from_sec(10)); - clean_child_exit(APEXIT_CHILDFATAL); + /* let the parent decide how bad this really is */ + clean_child_exit(APEXIT_CHILDSICK); } mpm_state = AP_MPMQ_RUNNING; diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c index 4eff2020e80..4e8031a3903 100644 --- a/server/mpm/worker/worker.c +++ b/server/mpm/worker/worker.c @@ -1173,11 +1173,8 @@ static void child_main(int child_num_arg) if (rv != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_ALERT, rv, ap_server_conf, "apr_thread_create: unable to create worker thread"); - /* In case system resources are maxxed out, we don't want - Apache running away with the CPU trying to fork over and - over and over again if we exit. */ - apr_sleep(apr_time_from_sec(10)); - clean_child_exit(APEXIT_CHILDFATAL); + /* let the parent decide how bad this really is */ + clean_child_exit(APEXIT_CHILDSICK); } mpm_state = AP_MPMQ_RUNNING;