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