From: Jeff Trawick <trawick@apache.org>
Date: Mon, 28 Mar 2011 14:04:23 +0000 (+0000)
Subject: some non-MPM code wants to see DEFAULT_PIDLOG, so liberate the
X-Git-Tag: 2.3.12~165
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1ac3fd574e8be765115c4ab654d79f781700cf4;p=thirdparty%2Fapache%2Fhttpd.git

some non-MPM code wants to see DEFAULT_PIDLOG, so liberate the
setting from the MPM-specific mpm_default.h

now visible again via httpd -V


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086243 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index e0ee0ded53b..7f34c4b339f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,7 +2,8 @@
 
 Changes with Apache 2.3.12
 
-  *) MPM helper function ap_remove_pid() added.  [Jeff Trawick]
+  *) Restore visibility of DEFAULT_PIDLOG to core and modules.  MPM 
+     helper function ap_remove_pid() added.  [Jeff Trawick]
 
   *) Enable DEFAULT_REL_RUNTIMEDIR on Windows and NetWare.  [various]
 
diff --git a/include/ap_config.h b/include/ap_config.h
index 3a02bbef11c..1eba92532c5 100644
--- a/include/ap_config.h
+++ b/include/ap_config.h
@@ -235,6 +235,11 @@
 #endif
 #include "ap_config_layout.h"
 
+/* Where the main/parent process's pid is logged */
+#ifndef DEFAULT_PIDLOG
+#define DEFAULT_PIDLOG DEFAULT_REL_RUNTIMEDIR "/httpd.pid"
+#endif
+
 #if defined(NETWARE)
 #define AP_NONBLOCK_WHEN_MULTI_LISTEN 1
 #endif
diff --git a/server/mpm/event/mpm_default.h b/server/mpm/event/mpm_default.h
index d27b233c50f..33283772b66 100644
--- a/server/mpm/event/mpm_default.h
+++ b/server/mpm/event/mpm_default.h
@@ -51,11 +51,6 @@
 #define DEFAULT_THREADS_PER_CHILD 25
 #endif
 
-/* Where the main/parent process's pid is logged */
-#ifndef DEFAULT_PIDLOG
-#define DEFAULT_PIDLOG DEFAULT_REL_RUNTIMEDIR "/httpd.pid"
-#endif
-
 /* Number of requests to try to handle in a single process.  If <= 0,
  * the children don't die off.
  */
diff --git a/server/mpm/mpmt_os2/mpm_default.h b/server/mpm/mpmt_os2/mpm_default.h
index e69c437db3f..b25effa8578 100644
--- a/server/mpm/mpmt_os2/mpm_default.h
+++ b/server/mpm/mpmt_os2/mpm_default.h
@@ -45,11 +45,6 @@
 #define DEFAULT_MIN_SPARE_THREAD 5
 #endif
 
-/* Where the main/parent process's pid is logged */
-#ifndef DEFAULT_PIDLOG
-#define DEFAULT_PIDLOG DEFAULT_REL_RUNTIMEDIR "/httpd.pid"
-#endif
-
 /*
  * Interval, in microseconds, between scoreboard maintenance.
  */
diff --git a/server/mpm/netware/mpm_default.h b/server/mpm/netware/mpm_default.h
index 1859f4d9a06..b79cb6bdf57 100644
--- a/server/mpm/netware/mpm_default.h
+++ b/server/mpm/netware/mpm_default.h
@@ -60,12 +60,6 @@
 #define DEFAULT_MIN_FREE_THREADS 10
 #endif
 
-/* Where the main/parent process's pid is logged */
-/*#ifndef DEFAULT_PIDLOG
-  #define DEFAULT_PIDLOG DEFAULT_REL_RUNTIMEDIR "/httpd.pid"
-  #endif
-*/
-
 /*
  * Interval, in microseconds, between scoreboard maintenance.
  */
diff --git a/server/mpm/prefork/mpm_default.h b/server/mpm/prefork/mpm_default.h
index 02e9320ed90..38b65432a9a 100644
--- a/server/mpm/prefork/mpm_default.h
+++ b/server/mpm/prefork/mpm_default.h
@@ -46,11 +46,6 @@
 #define DEFAULT_MIN_FREE_DAEMON 5
 #endif
 
-/* Where the main/parent process's pid is logged */
-#ifndef DEFAULT_PIDLOG
-#define DEFAULT_PIDLOG DEFAULT_REL_RUNTIMEDIR "/httpd.pid"
-#endif
-
 /* Number of requests to try to handle in a single process.  If <= 0,
  * the children don't die off.
  */
diff --git a/server/mpm/winnt/mpm_default.h b/server/mpm/winnt/mpm_default.h
index 95143e311aa..184dc62f4f8 100644
--- a/server/mpm/winnt/mpm_default.h
+++ b/server/mpm/winnt/mpm_default.h
@@ -55,11 +55,6 @@
  */
 #define HARD_SERVER_LIMIT 1
 
-/* Where the main/parent process's pid is logged */
-#ifndef DEFAULT_PIDLOG
-#define DEFAULT_PIDLOG DEFAULT_REL_RUNTIMEDIR "/httpd.pid"
-#endif
-
 /* Number of requests to try to handle in a single process.  If <= 0,
  * the children don't die off.
  */
diff --git a/server/mpm/worker/mpm_default.h b/server/mpm/worker/mpm_default.h
index c8ea98ac9e0..9b8a6f91b77 100644
--- a/server/mpm/worker/mpm_default.h
+++ b/server/mpm/worker/mpm_default.h
@@ -50,11 +50,6 @@
 #define DEFAULT_THREADS_PER_CHILD 25
 #endif
 
-/* Where the main/parent process's pid is logged */
-#ifndef DEFAULT_PIDLOG
-#define DEFAULT_PIDLOG DEFAULT_REL_RUNTIMEDIR "/httpd.pid"
-#endif
-
 /* Number of requests to try to handle in a single process.  If <= 0,
  * the children don't die off.
  */