Commit b381aa9c authored by Yann Ylavic's avatar Yann Ylavic
Browse files

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
parent ce89c2fe

server/main.c

+1 −0
Original line number Diff line number Diff line
@@ -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);