This is to address the following bug: https://bugzilla.redhat.com/show_bug.cgi?id=1410883
The only reason why I can see why the orig idea to use s->process->pool was to make watchdog run independent of any restarts of httpd itself... that is, a truly independent watchdog. But that would imply that you can't reconfig watchdog on restarts which doesn't seem quite right... thoughts? > On Jan 11, 2017, at 11:00 AM, [email protected] wrote: > > Author: jim > Date: Wed Jan 11 16:00:37 2017 > New Revision: 1778319 > > URL: http://svn.apache.org/viewvc?rev=1778319&view=rev > Log: > Use pconf as parent pool so mutexes get cleaned on restarts/reloads > > Modified: > httpd/httpd/trunk/modules/core/mod_watchdog.c > > Modified: httpd/httpd/trunk/modules/core/mod_watchdog.c > URL: > http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/mod_watchdog.c?rev=1778319&r1=1778318&r2=1778319&view=diff > ============================================================================== > --- httpd/httpd/trunk/modules/core/mod_watchdog.c (original) > +++ httpd/httpd/trunk/modules/core/mod_watchdog.c Wed Jan 11 16:00:37 2017 > @@ -436,7 +436,7 @@ static int wd_post_config_hook(apr_pool_ > { > 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) > >
