Commit e9adb268 authored by Mladen Turk's avatar Mladen Turk
Browse files

Axe check for second post config call. New ap_state_query(AP_SQ_MAIN_STATE) ==... 

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
parent 614564c8

modules/core/mod_watchdog.c

+0 −13
Changes for modules/core/mod_watchdog.c: 0 added lines, 13 removed lines.
Original line number Diff line number Diff line
@@ -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))))