diff options
| author | Yann Ylavic <ylavic@apache.org> | 2014-10-07 18:54:31 +0200 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2014-10-07 18:54:31 +0200 |
| commit | d2bec9df64248aedcd7c6151c600c51e2155db9a (patch) | |
| tree | 02e87d72ae2362cb468011de710fb5b9d0124043 /server/mpm/eventopt/eventopt.c | |
| parent | mpms: enforce assertion that unreachable code is not reached. (diff) | |
| download | apache2-d2bec9df64248aedcd7c6151c600c51e2155db9a.tar.xz apache2-d2bec9df64248aedcd7c6151c600c51e2155db9a.zip | |
core: ensure that MPMs return an error on runtime failure and hence that
httpd's main process also exits with an error.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1629925 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/mpm/eventopt/eventopt.c')
| -rw-r--r-- | server/mpm/eventopt/eventopt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/mpm/eventopt/eventopt.c b/server/mpm/eventopt/eventopt.c index f58aa8378f..a19304989f 100644 --- a/server/mpm/eventopt/eventopt.c +++ b/server/mpm/eventopt/eventopt.c @@ -2815,7 +2815,7 @@ static int event_run(apr_pool_t * _pconf, apr_pool_t * plog, server_rec * s) if (!retained->is_graceful) { if (ap_run_pre_mpm(s->process->pool, SB_SHARED) != OK) { mpm_state = AP_MPMQ_STOPPING; - return DONE; + return !OK; } /* fix the generation number in the global score; we just got a new, * cleared scoreboard |