diff options
| author | Stefan Fritsch <sf@apache.org> | 2011-02-13 22:34:02 +0000 |
|---|---|---|
| committer | Stefan Fritsch <sf@apache.org> | 2011-02-13 22:34:02 +0000 |
| commit | d2b73e573068038a4c2c0ed88c3da52a4d981f6c (patch) | |
| tree | f1f1d68eb8467a5ffcc6f1e803e2940036d925c8 /modules/core | |
| parent | 43fc2d47c7ec261abefc5bafecfdb9e66c48fd30 (diff) | |
| download | httpd-d2b73e573068038a4c2c0ed88c3da52a4d981f6c.tar.gz | |
Fix two bugs introduced by r1070153
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1070317 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/core')
| -rw-r--r-- | modules/core/mod_watchdog.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/modules/core/mod_watchdog.c b/modules/core/mod_watchdog.c index 7bc8a350ad..1642ee4690 100644 --- a/modules/core/mod_watchdog.c +++ b/modules/core/mod_watchdog.c @@ -440,13 +440,6 @@ static int wd_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pproc = s->process->pool; const apr_array_header_t *wl; - apr_pool_userdata_get((void *)&wd_server_conf, pk, pproc); - if (!wd_server_conf) { - if (!(wd_server_conf = apr_pcalloc(pproc, sizeof(wd_server_conf_t)))) - return APR_ENOMEM; - apr_pool_create(&wd_server_conf->pool, pproc); - } - if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG) /* First time config phase -- skip. */ return OK; @@ -463,6 +456,14 @@ static int wd_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog, } } #endif + + apr_pool_userdata_get((void *)&wd_server_conf, pk, pproc); + if (!wd_server_conf) { + if (!(wd_server_conf = apr_pcalloc(pproc, 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); + } wd_server_conf->s = s; if ((wl = ap_list_provider_names(pconf, AP_WATCHODG_PGROUP, AP_WATCHODG_PVERSION))) { |