From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 28 Sep 2001 15:24:34 +0000 (+0000)
Subject:   Debug conf pool constness.  This is a noop most of the time on most
X-Git-Tag: 2.0.26~170
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e11c9604fef0e9c760ec6bece6d677494fa084c9;p=thirdparty%2Fapache%2Fhttpd.git

  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
---

diff --git a/server/main.c b/server/main.c
index 4b18845e141..9aa11f640c6 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. */
 }