New directives should really come with documentation. This is

my best guess at what the documentation for the AcceptMutex directive
should look like.

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

diff --git a/docs/manual/mod/directives.html b/docs/manual/mod/directives.html
index 6eceb5b21167e20076d53e7871d7197c533e67ee..e9bd65918fe0989f765351fdd76c6824ca64d027 100644 (file)
--- a/docs/manual/mod/directives.html
+++ b/docs/manual/mod/directives.html
@@ -24,6 +24,7 @@ listed here.  They are described using a consistent format, and there is
 of the terms used in their descriptions available.
 </P>
 <UL>
+<LI><A HREF="prefork.html#acceptmutex">AcceptMutex</A>
 <LI><A HREF="core.html#accessfilename">AccessFileName</A>
 <LI><A HREF="mod_actions.html#action">Action</A>
 <LI><A HREF="mod_autoindex.html#addalt">AddAlt</A>

diff --git a/docs/manual/mod/prefork.html b/docs/manual/mod/prefork.html
index 26372a9ed587162d4ba493fb658328eec923719b..3afba13b74c476837ae0028ad94a255536521e5c 100644 (file)
--- a/docs/manual/mod/prefork.html
+++ b/docs/manual/mod/prefork.html
@@ -80,6 +80,7 @@ Apache uses</a>.</p>
 
 <H2>Directives</H2>
 <UL>
+<li><a href="#acceptmutex">AcceptMutex</a>
 <li><a href="mpm_common.html#coredumpdirectory">CoreDumpDirectory</a></li>
 <li><a href="mpm_common.html#group">Group</a></li>
 <li><a href="mpm_common.html#pidfile">PidFile</a></li>
@@ -99,6 +100,62 @@ Apache uses</a>.</p>
 <p><hr>
 
 
+<H2><A NAME="AcceptMutex">AcceptMutex Directive</A></H2>
+<p><A
+ HREF="directive-dict.html#Syntax"
+ REL="Help"
+><STRONG>Syntax:</STRONG></A> AcceptMutex default|<EM>method</EM><BR>
+<A
+ HREF="directive-dict.html#Default"
+ REL="Help"
+><STRONG>Default:</STRONG></A> <code>AcceptMutex default</code><BR>
+<A
+ HREF="directive-dict.html#Context"
+ REL="Help"
+><STRONG>Context:</STRONG></A> server config<BR>
+<A
+ HREF="directive-dict.html#Status"
+ REL="Help"
+><STRONG>Status:</STRONG></A> core</p>
+
+<p>The <code>AcceptMutex</code> directives sets the method that Apache
+uses to serialize multiple children accepting requests on network
+sockets. Prior to Apache 2.0, the method was selectable only at
+compile time. The optimal method to use is highly architecture and
+platform dependent.  For further details, see the <a
+href="../misc/perf-tuning.html">performance tuning</a>
+documentation.</p>
+
+<p>If this directive is set to <code>default</code>, then the
+compile-time selected default will be used.  Other possible
+methods are listed below.  Note that not all methods are available
+on all platforms.  If a method is specified which is not available,
+a message will be written to the error log listing the available
+methods.</p>
+
+<dl>
+
+<dt><code>flock</code></dt>
+<dd>uses the <code>flock(2)</code> system call to lock the
+file defined by the <a href="mpm_common.html#lockfile">LockFile</a>
+directive.</dd>
+
+<dt><code>fcntl</code></dt>
+<dd>uses the <code>fnctl(2)</code> system call to lock the
+file defined by the <a href="mpm_common.html#lockfile">LockFile</a>
+directive.</dd>
+
+<dt><code>sysvsem</code></dt>
+<dd>uses SySV-style semaphores to implement the mutex.</dd>
+
+<dt><code>proc_pthread</code></dt>
+<dd>uses POSIX mutexes as implemented by the POSIX Threads (PThreads)
+specification.</dd>
+
+</dl>
+
+<hr>
+
 <H2><A NAME="maxspareservers">MaxSpareServers directive</A></H2>
 <!--%plaintext &lt;?INDEX {\tt MaxSpareServers} directive&gt; -->
 <A