From bebf74df532f5b32a9557e07e19a813ef72b071c Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Thu, 5 Jul 2018 19:26:56 +0000 Subject: [PATCH] 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 --- server/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/server/main.c b/server/main.c index 3a4b1a6254..f1bebeb89c 100644 --- 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); -- 2.40.0