From: Ben Hyde <bhyde@apache.org>
Date: Thu, 7 Oct 1999 15:33:06 +0000 (+0000)
Subject: Changed my mind, ptemp maybe "systolic" but since it is empty
X-Git-Tag: 1.3.10~301
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7298ff9b6a7abff76ce0d694358d88e5bc265246;p=thirdparty%2Fapache%2Fhttpd.git

Changed my mind, ptemp maybe "systolic" but since it is empty
during the entire time the server is serving it's best to destroy it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83940 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/main.c b/server/main.c
index 44e031fceac..0251cf055d2 100644
--- a/server/main.c
+++ b/server/main.c
@@ -334,17 +334,18 @@ API_EXPORT_NONSTD(int)        main(int argc, char *argv[])
     ap_clear_pool(plog);
     ap_run_open_logs(pconf, plog, ptemp, server_conf);
     ap_post_config_hook(pconf, plog, ptemp, server_conf);
-    ap_clear_pool(ptemp);
+    ap_destroy_pool(ptemp);
 
     for (;;) {
+	ap_create_context(&ptemp, pconf);
 	ap_clear_pool(pconf);
-	ap_clear_pool(ptemp);
 	ap_server_root = def_server_root;
 	ap_run_pre_config(pconf, plog, ptemp);
 	server_conf = ap_read_config(pconf, ptemp, confname);
 	ap_clear_pool(plog);
 	ap_run_open_logs(pconf, plog, ptemp, server_conf);
 	ap_post_config_hook(pconf, plog, ptemp, server_conf);
+	ap_destroy_pool(ptemp);
 
 	if (ap_mpm_run(pconf, plog, server_conf)) break;
     }