www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Fix two bugs introduced by r1070153

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1070317 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Fritsch
2011-02-13 22:34:02 +00:00
parent 43fc2d47c7
commit d2b73e5730
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/core/mod_watchdog.c
View File

@@ -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; apr_pool_t *pproc = s->process->pool;
const apr_array_header_t *wl; 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) if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG)
/* First time config phase -- skip. */ /* First time config phase -- skip. */
return OK; return OK;
@@ -463,6 +456,14 @@ static int wd_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog,
} }
} }
#endif #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; wd_server_conf->s = s;
if ((wl = ap_list_provider_names(pconf, AP_WATCHODG_PGROUP, if ((wl = ap_list_provider_names(pconf, AP_WATCHODG_PGROUP,
AP_WATCHODG_PVERSION))) { AP_WATCHODG_PVERSION))) {

2
modules/ssl/ssl_scache.c
View File

@@ -48,7 +48,7 @@ void ssl_scache_init(server_rec *s, apr_pool_t *p)
* this first (and only the first) time through, since the pool * this first (and only the first) time through, since the pool
* will be immediately cleared anyway. For every subsequent * will be immediately cleared anyway. For every subsequent
* invocation, initialize the configured cache. */ * invocation, initialize the configured cache. */
if (!ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG) if (ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG)
return; return;
#ifdef HAVE_OCSP_STAPLING #ifdef HAVE_OCSP_STAPLING