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 e0ee0ded53b57abcfd9bdb4b4aed1f77b6ec6182..7f34c4b339f5fe9ec20144b31dd86c227d03b950 100644 (file)
--- 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 3a02bbef11cbc26d8c964fbe8465799bf25f5af3..1eba92532c532884440f9b5e6c74a51e63d0f9c4 100644 (file)
--- 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 d27b233c50fa5ed06021ba55cca090a8724459da..33283772b66269603a19d31db09a9db789aafc5b 100644 (file)
--- 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 e69c437db3f29cde494f3b1d746d91dfc6344534..b25effa8578627dfcc333560f2a274978923dff6 100644 (file)
--- 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 1859f4d9a06360ec59ea3a28f354140b2af10f60..b79cb6bdf57359c1538124a6fdd42554e2b39e81 100644 (file)
--- 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 02e9320ed9081d871e5173e31fa5c3b8d6a8afef..38b65432a9aa03411d78d45413bccae88fc97c57 100644 (file)
--- 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 95143e311aa73b5667a48be5eb3fa5d7f68052eb..184dc62f4f809b2a38cbe1b48d6cf6416ea65d44 100644 (file)
--- 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 c8ea98ac9e04666e62254a0c82d0e97c808cbb8e..9b8a6f91b7780fd54699f05482df590b2757b210 100644 (file)
--- 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.
  */