]> granicus.if.org Git - apache/commitdiff
global ap_server_conf must be reset when process->pconf is cleared
authorEric Covener <covener@apache.org>
Thu, 5 Jul 2018 02:33:34 +0000 (02:33 +0000)
committerEric Covener <covener@apache.org>
Thu, 5 Jul 2018 02:33:34 +0000 (02:33 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1835094 13f79535-47bb-0310-9956-ffa450edef68

server/main.c

index cd12521229e727d2a1ad6246ddf289621b69e88b..a88085fe9f1f004a3df6068d11dbbb5a1e0fdec4 100644 (file)
@@ -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);