Merge r1835094 from trunk (follow up to 2.4.x's r1834321):

global ap_server_conf must be reset when process->pconf is cleared

Submitted by: covener
Reviewed by: covener, rpluem, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1835175 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/server/main.c b/server/main.c
index 3a4b1a6254fe5bd06f3baec076e901951e4b09cb..f1bebeb89c8ff530e9ae8dae86df741f6eb1812a 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -289,6 +289,7 @@ static void reset_process_pconf(process_rec *process)
 {
     if (process->pconf) {
         apr_pool_clear(process->pconf);
+        ap_server_conf = NULL;
     }
     else {
         apr_pool_create(&process->pconf, process->pool);