# ./pullrev.sh 1778319 1778331 https://bugzilla.redhat.com/show_bug.cgi?id=1410883 http://svn.apache.org/viewvc?view=revision&revision=1778319 http://svn.apache.org/viewvc?view=revision&revision=1778331 --- httpd-2.4.6/modules/core/mod_watchdog.c +++ httpd-2.4.6/modules/core/mod_watchdog.c @@ -436,19 +436,19 @@ { apr_status_t rv; const char *pk = "watchdog_init_module_tag"; - apr_pool_t *pproc = s->process->pool; + apr_pool_t *ppconf = pconf; const apr_array_header_t *wl; if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG) /* First time config phase -- skip. */ return OK; - apr_pool_userdata_get((void *)&wd_server_conf, pk, pproc); + apr_pool_userdata_get((void *)&wd_server_conf, pk, ppconf); if (!wd_server_conf) { - if (!(wd_server_conf = apr_pcalloc(pproc, sizeof(wd_server_conf_t)))) + if (!(wd_server_conf = apr_pcalloc(ppconf, sizeof(wd_server_conf_t)))) return APR_ENOMEM; - apr_pool_create(&wd_server_conf->pool, pproc); - apr_pool_userdata_set(wd_server_conf, pk, apr_pool_cleanup_null, pproc); + apr_pool_create(&wd_server_conf->pool, ppconf); + apr_pool_userdata_set(wd_server_conf, pk, apr_pool_cleanup_null, ppconf); } wd_server_conf->s = s; if ((wl = ap_list_provider_names(pconf, AP_WATCHDOG_PGROUP,