diff options
| author | Stefan Fritsch <sf@apache.org> | 2010-08-21 18:06:41 +0000 |
|---|---|---|
| committer | Stefan Fritsch <sf@apache.org> | 2010-08-21 18:06:41 +0000 |
| commit | 8f840cb763aa67f331cecc4e5e850bb07d2a9943 (patch) | |
| tree | f849def8fc48e41a7b682b7da935607eb94f15dd /server/config.c | |
| parent | 105ce3617b0caff1fe2a90415827e9f62694cdd0 (diff) | |
| download | httpd-8f840cb763aa67f331cecc4e5e850bb07d2a9943.tar.gz | |
core: Abort with sensible error message if no or more than one MPM is
loaded.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@987806 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/config.c')
| -rw-r--r-- | server/config.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/server/config.c b/server/config.c index b58f096939..ea54280ea4 100644 --- a/server/config.c +++ b/server/config.c @@ -49,6 +49,7 @@ #include "http_main.h" #include "http_vhost.h" #include "util_cfgtree.h" +#include "mpm_common.h" #define APLOG_UNSET (APLOG_NO_MODULE - 1) APLOG_USE_MODULE(core); @@ -2242,6 +2243,13 @@ AP_DECLARE(server_rec*) ap_read_config(process_rec *process, apr_pool_t *ptemp, return NULL; } + error = ap_check_mpm(); + if (error) { + ap_log_error(APLOG_MARK, APLOG_STARTUP|APLOG_CRIT, 0, NULL, + "%s: Configuration error: %s", ap_server_argv0, error); + return NULL; + } + /* * We have loaded the dynamic modules. From now on we know exactly how * long the config vectors need to be. |