httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r1210445 - /httpd/httpd/trunk/modules/core/mod_watchdog.c
Date Mon, 05 Dec 2011 13:07:48 GMT
Author: mturk
Date: Mon Dec  5 13:07:47 2011
New Revision: 1210445

URL: http://svn.apache.org/viewvc?rev=1210445&view=rev
Log:
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

Modified:
    httpd/httpd/trunk/modules/core/mod_watchdog.c

Modified: httpd/httpd/trunk/modules/core/mod_watchdog.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/core/mod_watchdog.c?rev=1210445&r1=1210444&r2=1210445&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/core/mod_watchdog.c (original)
+++ httpd/httpd/trunk/modules/core/mod_watchdog.c Mon Dec  5 13:07:47 2011
@@ -447,19 +447,6 @@ static int wd_post_config_hook(apr_pool_
         /* 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))))



Mime
View raw message