svn commit: r160172 - in httpd/httpd/branches/simple-conf/docs/conf: extra/httpd-mpm.conf.in httpd.conf.in

[sl...@apache.org]

Author: slive
Date: Tue Apr  5 07:02:44 2005
New Revision: 160172

URL: http://svn.apache.org/viewcvs?view=rev&rev=160172
Log:
An idea for solving the LockFile/PidFile issue by putting
them both in extra/httpd-mpm.conf, but including a comment
in the main file on when they will need to be changed.

Modified:
    httpd/httpd/branches/simple-conf/docs/conf/extra/httpd-mpm.conf.in
    httpd/httpd/branches/simple-conf/docs/conf/httpd.conf.in

Modified: httpd/httpd/branches/simple-conf/docs/conf/extra/httpd-mpm.conf.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/simple-conf/docs/conf/extra/httpd-mpm.conf.in?view=diff&r1=160171&r2=160172
==============================================================================
--- httpd/httpd/branches/simple-conf/docs/conf/extra/httpd-mpm.conf.in (original)
+++ httpd/httpd/branches/simple-conf/docs/conf/extra/httpd-mpm.conf.in Tue Apr  5 07:02:44 2005
@@ -1,9 +1,6 @@
 #
-# Server-Pool Size Regulation (MPM specific)
+# Server-Pool Management (MPM specific)
 # 
-# Only one of the below sections will be relevant on your
-# installed httpd.  Use "apachectl -l" to find out the
-# active mpm.
 
 #
 # PidFile: The file in which the server should record its process
@@ -14,6 +11,21 @@
 <IfModule !mpm_netware_module>
     PidFile @rel_runtimedir@/httpd.pid
 </IfModule>
+
+#
+# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
+#
+<IfModule !mpm_winnt_module>
+<IfModule !mpm_netware_module>
+LockFile @rel_logfiledir@/accept.lock
+</IfModule>
+</IfModule>
+
+#
+# Only one of the below sections will be relevant on your
+# installed httpd.  Use "apachectl -l" to find out the
+# active mpm.
+#
 
 # prefork MPM
 # StartServers: number of server processes to start

Modified: httpd/httpd/branches/simple-conf/docs/conf/httpd.conf.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/simple-conf/docs/conf/httpd.conf.in?view=diff&r1=160171&r2=160172
==============================================================================
--- httpd/httpd/branches/simple-conf/docs/conf/httpd.conf.in (original)
+++ httpd/httpd/branches/simple-conf/docs/conf/httpd.conf.in Tue Apr  5 07:02:44 2005
@@ -21,16 +21,12 @@
 # ServerRoot: The top of the directory tree under which the server's
 # configuration, error, and log files are kept.
 #
-# Do NOT add a slash at the end of the directory path.
+# Do NOT add a slash at the end of the directory path.  If you point
+# ServerRoot at a non-local disk, be sure to point the LockFile directive
+# at a local disk.  If you wish to share the same ServerRoot for multiple
+# httpd daemons, you will need to change at least LockFile and PidFile.
 #
 ServerRoot "@@ServerRoot@@"
-
-# NOTE! The following two directives are used on some systems
-# to coordinate the httpd children.  THEY MUST BE STORED ON
-# A LOCAL DISK!
-#
-#LockFile @rel_logfiledir@/accept.lock
-#ScoreBoardFile @rel_logfiledir@/apache_runtime_status
 
 #
 # Listen: Allows you to bind Apache to specific IP addresses and/or