Change the verbage on the ScoreBoardFile in our default configs.

Also change the default to be commented out (unspecified) so we
get anonymous shared memory by default.

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

diff --git a/CHANGES b/CHANGES
index 733256471651074b880f65a20a09f633fafaf6d4..55106e5aef1ba44737a1f65dce4d8c0d9bcd3f13 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,12 +1,16 @@
 Changes with Apache 2.0.33-dev
 
+  *) Change the verbage on the ScoreBoardFile in our default configs.
+     Also change the default to be commented out (unspecified) so we
+     get anonymous shared memory by default.  [Aaron Bannert]
+
   *) Implement new ScoreBoardFile directive logic. This affects how
      we create the scoreboard's shared memory segment. If the directive
      is present, a name-based segment is created. If the directive is
      not present, first an anonymous segment is created, and if that
      fails, a name-based segment is created from a file of the name
      DEFAULT_SCOREBOARD. This gives third-party applications the
-     ability to access our scoreboard. [Aaron Bannert]
+     ability to access our scoreboard.  [Aaron Bannert]
 
   *) Allow mod_deflate to work with non-GET requests and properly send
      Content-Lengths.  [Sander Striker <striker@apache.org>]

diff --git a/docs/conf/httpd-std.conf b/docs/conf/httpd-std.conf
index 6533dcb6194617a503b9642005f3ce927b701dcc..7a408098d67b7880fa976421a0902af202893b88 100644 (file)
--- a/docs/conf/httpd-std.conf
+++ b/docs/conf/httpd-std.conf
@@ -60,13 +60,15 @@ ServerRoot "@@ServerRoot@@"
 
 #
 # ScoreBoardFile: File used to store internal server process information.
-# Not all architectures require this.  But if yours does (you'll know because
-# this file will be  created when you run Apache) then you *must* ensure that
-# no two invocations of Apache share the same scoreboard file.
+# If unspecified (the default), the scoreboard will be stored in an
+# anonymous shared memory segment, and will be unavailable to third-party
+# applications.
+# If specified, ensure that no two invocations of Apache share the same
+# scoreboard file. The scoreboard file MUST BE STORED ON A LOCAL DISK.
 #
 <IfModule !mpm_netware.c>
 <IfModule !perchild.c>
-ScoreBoardFile logs/apache_runtime_status
+#ScoreBoardFile logs/apache_runtime_status
 </IfModule>
 </IfModule>
 

diff --git a/docs/conf/httpd-win.conf b/docs/conf/httpd-win.conf
index c1b93fe773af358b4536aa6ea61357849c7d781c..4714dfa0cd126f072939afba37fa80879c9561ad 100644 (file)
--- a/docs/conf/httpd-win.conf
+++ b/docs/conf/httpd-win.conf
@@ -58,11 +58,13 @@ ServerRoot "@@ServerRoot@@"
 
 #
 # ScoreBoardFile: File used to store internal server process information.
-# Not all architectures require this.  But if yours does (you'll know because
-# this file will be  created when you run Apache) then you *must* ensure that
-# no two invocations of Apache share the same scoreboard file.
+# If unspecified (the default), the scoreboard will be stored in an
+# anonymous shared memory segment, and will be unavailable to third-party
+# applications.
+# If specified, ensure that no two invocations of Apache share the same
+# scoreboard file. The scoreboard file MUST BE STORED ON A LOCAL DISK.
 #
-ScoreBoardFile logs/apache_runtime_status
+#ScoreBoardFile logs/apache_runtime_status
 
 #
 # PidFile: The file in which the server should record its process