summaryrefslogtreecommitdiffstats
path: root/server/main.c
diff options
context:
space:
mode:
authorWilliam A. Rowe Jr <wrowe@apache.org>2001-09-28 17:24:34 +0200
committerWilliam A. Rowe Jr <wrowe@apache.org>2001-09-28 17:24:34 +0200
commite11c9604fef0e9c760ec6bece6d677494fa084c9 (patch)
treeae314703b8a47fcf04ff02a926ba396be1d1a29c /server/main.c
parentRemove SMS from the error bucket. SMS is going away now, it isn't really (diff)
downloadapache2-e11c9604fef0e9c760ec6bece6d677494fa084c9.tar.xz
apache2-e11c9604fef0e9c760ec6bece6d677494fa084c9.zip
Debug conf pool constness. This is a noop most of the time on most
platforms, but it's only called twice per restart, so this is mostly harmless. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91178 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/main.c')
-rw-r--r--server/main.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/server/main.c b/server/main.c
index 4b18845e14..9aa11f640c 100644
--- a/server/main.c
+++ b/server/main.c
@@ -425,11 +425,14 @@ int main(int argc, const char * const argv[])
ap_run_open_logs(pconf, plog, ptemp, server_conf);
ap_run_post_config(pconf, plog, ptemp, server_conf);
apr_pool_destroy(ptemp);
+ apr_pool_lock(pconf, 1);
ap_run_optional_fn_retrieve();
if (ap_mpm_run(pconf, plog, server_conf)) break;
+ apr_pool_lock(pconf, 0);
}
+ apr_pool_lock(pconf, 0);
destroy_and_exit_process(process, 0);
return 0; /* Supress compiler warning. */
}