From f63c6e73bcbeef361fe6898c4d2ccc17d1b98850 Mon Sep 17 00:00:00 2001 From: Mladen Turk Date: Mon, 5 Dec 2011 13:07:47 +0000 Subject: [PATCH] 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 --- modules/core/mod_watchdog.c | 13 ------------- 1 file changed, 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)))) -- 2.40.0