summaryrefslogtreecommitdiffstats
path: root/modules/core
diff options
context:
space:
mode:
authorJim Jagielski <jim@apache.org>2017-01-11 17:00:37 +0100
committerJim Jagielski <jim@apache.org>2017-01-11 17:00:37 +0100
commit4e8baf18d2bcfde488826b8c679f900b659ac997 (patch)
tree64c7f25ac7cd2b68510745aa842e091cef3ddfc0 /modules/core
parent* Silence compiler warning (diff)
downloadapache2-4e8baf18d2bcfde488826b8c679f900b659ac997.tar.xz
apache2-4e8baf18d2bcfde488826b8c679f900b659ac997.zip
Use pconf as parent pool so mutexes get cleaned on restarts/reloads
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1778319 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/core')
-rw-r--r--modules/core/mod_watchdog.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/core/mod_watchdog.c b/modules/core/mod_watchdog.c
index a5eb4bf04d..0cab52e2fa 100644
--- a/modules/core/mod_watchdog.c
+++ b/modules/core/mod_watchdog.c
@@ -436,7 +436,7 @@ static int wd_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog,
{
apr_status_t rv;
const char *pk = "watchdog_init_module_tag";
- apr_pool_t *pproc = s->process->pool;
+ apr_pool_t *pproc = pconf;
const apr_array_header_t *wl;
if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG)