From: Eric Covener <covener@apache.org>
Date: Thu, 5 Jul 2018 02:33:34 +0000 (+0000)
Subject: global ap_server_conf must be reset when process->pconf is cleared
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2499
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d7e00ab7f831b685b19d68ced5cdbf6ff608f802;p=thirdparty%2Fapache%2Fhttpd.git

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



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

diff --git a/server/main.c b/server/main.c
index cd12521229e..a88085fe9f1 100644
--- a/server/main.c
+++ b/server/main.c
@@ -311,6 +311,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);