diff options
| author | Mladen Turk <mturk@apache.org> | 2011-12-05 13:07:47 +0000 |
|---|---|---|
| committer | Mladen Turk <mturk@apache.org> | 2011-12-05 13:07:47 +0000 |
| commit | f63c6e73bcbeef361fe6898c4d2ccc17d1b98850 (patch) | |
| tree | cb7b9b77fa855fa3b5f61fc0cb6b113fc17412fb /modules/core | |
| parent | 0f05cbe719102332b36cb844c79e5aa7dd7747b1 (diff) | |
| download | httpd-f63c6e73bcbeef361fe6898c4d2ccc17d1b98850.tar.gz | |
Axe check for second post config call. New ap_state_query(AP_SQ_MAIN_STATE) == AP_SQ_MS_CREATE_PRE_CONFIG API call does exactly that, so we were actually expecting 4 calls ending up with NULL config in child hook
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1210445 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/core')
| -rw-r--r-- | modules/core/mod_watchdog.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/modules/core/mod_watchdog.c b/modules/core/mod_watchdog.c index 68820e8885..47ab149ba1 100644 --- a/modules/core/mod_watchdog.c +++ b/modules/core/mod_watchdog.c @@ -447,19 +447,6 @@ static int wd_post_config_hook(apr_pool_t *pconf, apr_pool_t *plog, /* First time config phase -- skip. */ return OK; -#if defined(WIN32) - { - const char *ppid = getenv("AP_PARENT_PID"); - if (ppid && *ppid) { - ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(01570) - "[%" APR_PID_T_FMT " - %s] " - "child second stage post config hook", - getpid(), ppid); - return OK; - } - } -#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)))) |