From: Yann Ylavic <ylavic@apache.org>
Date: Sun, 22 Nov 2020 01:06:11 +0000 (+0000)
Subject: core: reset ap_runtime_dir to NULL after AP_SQ_MS_DESTROY_CONFIG.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b11bbeebd6ae8e0059320572d9b5866232894dc3;p=thirdparty%2Fapache%2Fhttpd.git

core: reset ap_runtime_dir to NULL after AP_SQ_MS_DESTROY_CONFIG.

ap_runtime_dir_relative() might reuse ap_runtime_dir from previously cleared
pconf otherwise.


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

diff --git a/server/core.c b/server/core.c
index 8370812d86f..e030f9eae36 100644
--- a/server/core.c
+++ b/server/core.c
@@ -5846,6 +5846,7 @@ static int core_upgrade_storage(request_rec *r)
 
 static void register_hooks(apr_pool_t *p)
 {
+    ap_runtime_dir = NULL;
     errorlog_hash = apr_hash_make(p);
     ap_register_log_hooks(p);
     ap_register_config_hooks(p);