You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2011/03/28 16:04:23 UTC
svn commit: r1086243 - in /httpd/httpd/trunk: ./ include/ server/mpm/event/
server/mpm/mpmt_os2/ server/mpm/netware/ server/mpm/prefork/
server/mpm/winnt/ server/mpm/worker/
Author: trawick
Date: Mon Mar 28 14:04:23 2011
New Revision: 1086243
URL: http://svn.apache.org/viewvc?rev=1086243&view=rev
Log:
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
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/include/ap_config.h
httpd/httpd/trunk/server/mpm/event/mpm_default.h
httpd/httpd/trunk/server/mpm/mpmt_os2/mpm_default.h
httpd/httpd/trunk/server/mpm/netware/mpm_default.h
httpd/httpd/trunk/server/mpm/prefork/mpm_default.h
httpd/httpd/trunk/server/mpm/winnt/mpm_default.h
httpd/httpd/trunk/server/mpm/worker/mpm_default.h
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1086243&r1=1086242&r2=1086243&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Mon Mar 28 14:04:23 2011
@@ -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]
Modified: httpd/httpd/trunk/include/ap_config.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/include/ap_config.h?rev=1086243&r1=1086242&r2=1086243&view=diff
==============================================================================
--- httpd/httpd/trunk/include/ap_config.h (original)
+++ httpd/httpd/trunk/include/ap_config.h Mon Mar 28 14:04:23 2011
@@ -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
Modified: httpd/httpd/trunk/server/mpm/event/mpm_default.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/mpm_default.h?rev=1086243&r1=1086242&r2=1086243&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/mpm_default.h (original)
+++ httpd/httpd/trunk/server/mpm/event/mpm_default.h Mon Mar 28 14:04:23 2011
@@ -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.
*/
Modified: httpd/httpd/trunk/server/mpm/mpmt_os2/mpm_default.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/mpmt_os2/mpm_default.h?rev=1086243&r1=1086242&r2=1086243&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/mpmt_os2/mpm_default.h (original)
+++ httpd/httpd/trunk/server/mpm/mpmt_os2/mpm_default.h Mon Mar 28 14:04:23 2011
@@ -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.
*/
Modified: httpd/httpd/trunk/server/mpm/netware/mpm_default.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/netware/mpm_default.h?rev=1086243&r1=1086242&r2=1086243&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/netware/mpm_default.h (original)
+++ httpd/httpd/trunk/server/mpm/netware/mpm_default.h Mon Mar 28 14:04:23 2011
@@ -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.
*/
Modified: httpd/httpd/trunk/server/mpm/prefork/mpm_default.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/prefork/mpm_default.h?rev=1086243&r1=1086242&r2=1086243&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/prefork/mpm_default.h (original)
+++ httpd/httpd/trunk/server/mpm/prefork/mpm_default.h Mon Mar 28 14:04:23 2011
@@ -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.
*/
Modified: httpd/httpd/trunk/server/mpm/winnt/mpm_default.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/mpm_default.h?rev=1086243&r1=1086242&r2=1086243&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/mpm_default.h (original)
+++ httpd/httpd/trunk/server/mpm/winnt/mpm_default.h Mon Mar 28 14:04:23 2011
@@ -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.
*/
Modified: httpd/httpd/trunk/server/mpm/worker/mpm_default.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/worker/mpm_default.h?rev=1086243&r1=1086242&r2=1086243&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/worker/mpm_default.h (original)
+++ httpd/httpd/trunk/server/mpm/worker/mpm_default.h Mon Mar 28 14:04:23 2011
@@ -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.
*/