summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Covener <covener@apache.org>2018-07-05 02:33:34 +0000
committerEric Covener <covener@apache.org>2018-07-05 02:33:34 +0000
commitd7e00ab7f831b685b19d68ced5cdbf6ff608f802 (patch)
tree268dcee1d467cebf76692fb299a60f8a69b3e9e3
parent40dec80eaa0d96d0bb00f9fe901193abf8e60fce (diff)
downloadhttpd-d7e00ab7f831b685b19d68ced5cdbf6ff608f802.tar.gz
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
-rw-r--r--server/main.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/server/main.c b/server/main.c
index cd12521229..a88085fe9f 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);