From: Mladen Turk <mturk@apache.org>
Date: Mon, 5 Dec 2011 13:11:35 +0000 (+0000)
Subject: Backport -r1210443 from trunk
X-Git-Tag: 2.3.16~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ba4d5f99970714b599da178b2b7e0023ab9914c;p=apache

Backport -r1210443 from trunk

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1210449 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/core/mod_watchdog.c b/modules/core/mod_watchdog.c
index 68820e8885..7ad13bf8d4 100644
--- a/modules/core/mod_watchdog.c
+++ b/modules/core/mod_watchdog.c
@@ -18,10 +18,6 @@
  */
 
 #include "apr.h"
-#if APR_HAVE_PROCESS_H
-#include <process.h>        /* for getpid() on Win32 */
-#endif
-
 #include "mod_watchdog.h"
 #include "ap_provider.h"
 #include "ap_mpm.h"
@@ -447,19 +443,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))))