* Follow up to r1927885: Changelog entry and documentation

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

diff --git a/changes-entries/listentcpdeferaccept.txt b/changes-entries/listentcpdeferaccept.txt
new file mode 100644 (file)
index 0000000..87dec8f
--- /dev/null
+++ b/changes-entries/listentcpdeferaccept.txt
@@ -0,0 +1,3 @@
+  *) mpm_common: Add new ListenTCPDeferAccept directive that allows to specify
+     the value set for the TCP_DEFER_ACCEPT socket option on listen sockets.
+     [Ruediger Pluem]

diff --git a/docs/manual/mod/mpm_common.xml b/docs/manual/mod/mpm_common.xml
index 36bf061cc20f088821083295421cebf7f41ff797..8eea7d88485924902ce683ac45e66d8621548631 100644 (file)
--- a/docs/manual/mod/mpm_common.xml
+++ b/docs/manual/mod/mpm_common.xml
@@ -402,6 +402,29 @@ in *BSDs.</compatibility>
 </usage>
 </directivesynopsis>
 
+<directivesynopsis>
+<name>ListenTCPDeferAccept</name>
+<description>Value set for the socket option TCP_DEFER_ACCEPT if it is set</description>
+<syntax>ListenTCPDeferAccept <var>integer</var></syntax>
+<default>ListenTCPDeferAccept 30</default>
+<contextlist><context>server config</context></contextlist>
+<modulelist><module>event</module><module>worker</module>
+<module>prefork</module>
+</modulelist>
+<compatibility>Available in Apache HTTP Server 2.5.1 and later</compatibility>
+
+<usage>
+    <p>The value specified here is set as a value for the socket option
+    <code>TCP_DEFER_ACCEPT</code> if it is set on the listen socket.
+    This happens when running on Linux and <directive
+    module="core">AcceptFilter</directive> is set to anything besides
+    <code>none</code>. In any other cases this setting is ignored.
+    For more details see the Linux
+    <a href="http://man7.org/linux/man-pages/man7/tcp.7.html">
+    tcp(7)</a> man page.</p>
+</usage>
+</directivesynopsis>
+
 <directivesynopsis>
 <name>MaxRequestWorkers</name>
 <description>Maximum number of connections that will be processed