summaryrefslogtreecommitdiffstats
path: root/server/mpm/worker/worker.c
diff options
context:
space:
mode:
authorYann Ylavic <ylavic@apache.org>2016-03-01 23:02:14 +0100
committerYann Ylavic <ylavic@apache.org>2016-03-01 23:02:14 +0100
commit4beeb250a5ba7e5aba6253cc69b9211b5f21804a (patch)
tree96fd85016004167588fe0ac764da1cca383ff755 /server/mpm/worker/worker.c
parentRemove backported entries. (diff)
downloadapache2-4beeb250a5ba7e5aba6253cc69b9211b5f21804a.tar.xz
apache2-4beeb250a5ba7e5aba6253cc69b9211b5f21804a.zip
mpms: follow up to r1629925: more error reports.
We want to be able to distinguish errors from stops to exit() with non-zero. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1733162 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/mpm/worker/worker.c')
-rw-r--r--server/mpm/worker/worker.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 564641a3e2..9629962ac8 100644
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -2048,7 +2048,7 @@ static int worker_open_logs(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp,
ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv,
(startup ? NULL : s), APLOGNO(03291)
"could not duplicate listeners");
- return DONE;
+ return !OK;
}
all_buckets = apr_pcalloc(pconf, num_buckets * sizeof(*all_buckets));
@@ -2058,7 +2058,7 @@ static int worker_open_logs(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp,
ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv,
(startup ? NULL : s), APLOGNO(03292)
"could not open pipe-of-death");
- return DONE;
+ return !OK;
}
/* Initialize cross-process accept lock (safe accept needed only) */
if ((rv = SAFE_ACCEPT((apr_snprintf(id, sizeof id, "%i", i),
@@ -2068,7 +2068,7 @@ static int worker_open_logs(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp,
ap_log_error(APLOG_MARK, APLOG_CRIT | level_flags, rv,
(startup ? NULL : s), APLOGNO(03293)
"could not create accept mutex");
- return DONE;
+ return !OK;
}
all_buckets[i].listeners = listen_buckets[i];
}