Merge LockFile docs.

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

2 files changed, 36 insertions, 3 deletions

diff --git a/docs/manual/mod/core.html b/docs/manual/mod/core.html
index 4f0a3033cf..6e4d5f0ced 100644
--- a/docs/manual/mod/core.html
+++ b/docs/manual/mod/core.html
@@ -43,7 +43,9 @@ always available.
 <li><A HREF="#keepalivetimeout">KeepAliveTimeout</A>
 <li><A HREF="#limit">&lt;Limit&gt;</A>
 <li><A HREF="#listen">Listen</A>
+<li><A HREF="#listenbacklog">ListenBacklog</A>
 <li><A HREF="#location">&lt;Location&gt;</A>
+<li><A HREF="#lockfile">LockFile</A>
 <li><A HREF="#maxclients">MaxClients</A>
 <li><A HREF="#maxkeepaliverequests">MaxKeepAliveRequests</a>
 <li><A HREF="#maxrequestsperchild">MaxRequestsPerChild</A>
@@ -658,6 +660,19 @@ directive.</p>
 <a href="../misc/known_bugs.html#listenbug">Known Bugs</a></p>
 <hr>
 
+<A NAME="listenbacklog"><H2>ListenBacklog</H2></A>
+<strong>Syntax:</strong> ListenBacklog <em>backlog</em><br>
+<strong>Default:</strong> <code>ListenBacklog 511</code><br>
+<strong>Context:</strong> server config<br>
+<strong>Status:</strong> Core<br>
+<strong>Compatibility:</strong> ListenBacklog is only available in Apache
+versions after 1.2.0.<p>
+
+The maximum length of the queue of pending connections.  Generally no
+tuning is needed or desired, however on some systems it is desirable
+to increase this when under a TCP SYN flood attack.  See 
+the backlog parameter to the <code>listen(2)</code> system call.
+
 <A name="limit"><h2>&lt;Limit&gt; directive</h2></A>
 <!--%plaintext &lt;?INDEX {\tt Limit} section directive&gt; -->
 <strong>Syntax:</strong>
@@ -714,7 +729,7 @@ the
    &lt;Location ~ &quot;/(extra|special)/data&quot;&gt;
 </pre>
 
-would match URLs that contained the substring "/extra/data" or
+<p>would match URLs that contained the substring "/extra/data" or
 "/special/data".</p>
 
 <p>The <code>Location</code> functionality is especially useful when
@@ -732,7 +747,23 @@ from browsers at foo.com, you might use:
 </pre>
 <hr>
 
-<A name="maxclients"><h2>MaxClients directive</h2></A>
+<A NAME="lockfile"><H2>LockFile</H2></A>
+<strong>Syntax:</strong> LockFile <em>filename</em><BR>
+<strong>Default:</strong> <code>LockFile logs/accept.lock</code><BR>
+<strong>Context:</strong> server config<BR>
+<strong>Status:</strong> core<P>
+
+The LockFile directive sets the path to the lockfile used when
+Apache is compiled with either USE_FCNTL_SERIALIZED_ACCEPT or
+USE_FLOCK_SERIALIZED_ACCEPT.  This directive should normally be
+left at its default value.  The main reason for changing it is if
+the <code>logs</code> directory is NFS mounted, since the lockfile
+should be stored on a local disk if possible.  The PID of the main
+server process is automatically appended to the filename.
+
+<P><HR>
+
+<A name="maxclients"><h2>MaxClients</h2></A>
 <!--%plaintext &lt;?INDEX {\tt MaxClients} directive&gt; -->
 <strong>Syntax:</strong> MaxClients <em>number</em><br>
 <strong>Default:</strong> <code>MaxClients 256</code><br>
@@ -1034,7 +1065,7 @@ sections; in fact it can now contain any server directive allowed in the
 
 See also <A HREF="#accessconfig">AccessConfig</A>.<p><hr>
 
-<A name="rlimit">
+<A name="rlimit"> </A>
 <A name="rlimitcpu"><h2>RLimitCPU directive</h2></A>
 <!--%plaintext &lt;?INDEX {\tt RLimitCPU} directive&gt; -->
 <strong>Syntax:</strong> RLimitCPU <em># or 'max'</em> <em>[# or 'max']</em><br>
diff --git a/docs/manual/mod/directives.html b/docs/manual/mod/directives.html
index 23599099c2..1c31c7b1a2 100644
--- a/docs/manual/mod/directives.html
+++ b/docs/manual/mod/directives.html
@@ -103,9 +103,11 @@
 <li><A HREF="mod_negotiation.html#languagepriority">LanguagePriority</A>
 <li><A HREF="core.html#limit">&lt;Limit&gt;</A>
 <li><A HREF="core.html#listen">Listen</A>
+<li><A HREF="core.html#listenbacklog">ListenBacklog</A>
 <li><A HREF="mod_dld.html#loadfile">LoadFile</A>
 <li><A HREF="mod_dld.html#loadmodule">LoadModule</A>
 <li><A HREF="core.html#location">&lt;Location&gt;</A>
+<li><A HREF="core.html#lockfile">LockFile</A>
 <li><A HREF="mod_log_config.html#logformat">LogFormat</A>
 <li><A HREF="core.html#maxclients">MaxClients</A>
 <li><A HREF="core.html#maxkeepaliverequests">MaxKeepAliveRequests</A>