You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mt...@apache.org on 2011/12/05 14:11:35 UTC
svn commit: r1210449 -
/httpd/httpd/branches/2.4.x/modules/core/mod_watchdog.c
Author: mturk
Date: Mon Dec 5 13:11:35 2011
New Revision: 1210449
URL: http://svn.apache.org/viewvc?rev=1210449&view=rev
Log:
Backport -r1210443 from trunk
Modified:
httpd/httpd/branches/2.4.x/modules/core/mod_watchdog.c
Modified: httpd/httpd/branches/2.4.x/modules/core/mod_watchdog.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/core/mod_watchdog.c?rev=1210449&r1=1210448&r2=1210449&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/core/mod_watchdog.c (original)
+++ httpd/httpd/branches/2.4.x/modules/core/mod_watchdog.c Mon Dec 5 13:11:35 2011
@@ -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_
/* 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))))