Rename MaxRequestsPerChild to MaxConnectionsPerChild, which

describes more accurately what the directive does.

The old name still works but logs a warning.


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

8 files changed, 22 insertions, 27 deletions

diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index ec79895825..2d354955c8 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -1792,7 +1792,7 @@ wildcard matching available in 2.3.6 and later</compatibility>
 
     <p>When a client uses a Keep-Alive connection it will be counted
     as a single "request" for the <directive module="mpm_common"
-    >MaxRequestsPerChild</directive> directive, regardless
+    >MaxConnectionsPerChild</directive> directive, regardless
     of how many requests are sent using the connection.</p>
 </usage>
 
diff --git a/docs/manual/mod/event.xml b/docs/manual/mod/event.xml
index 354f6d0e8c..cab1adf516 100644
--- a/docs/manual/mod/event.xml
+++ b/docs/manual/mod/event.xml
@@ -110,7 +110,7 @@ of consuming threads only for connections with active processing</description>
 </directivesynopsis>
 <directivesynopsis location="mpm_common"><name>MaxMemFree</name>
 </directivesynopsis>
-<directivesynopsis location="mpm_common"><name>MaxRequestsPerChild</name>
+<directivesynopsis location="mpm_common"><name>MaxConnectionsPerChild</name>
 </directivesynopsis>
 <directivesynopsis location="mpm_common"><name>MaxSpareThreads</name>
 </directivesynopsis>
diff --git a/docs/manual/mod/mpm_common.xml b/docs/manual/mod/mpm_common.xml
index 6d6335a0ae..b78d9764f8 100644
--- a/docs/manual/mod/mpm_common.xml
+++ b/docs/manual/mod/mpm_common.xml
@@ -326,22 +326,24 @@ to hold without calling <code>free()</code></description>
 </directivesynopsis>
 
 <directivesynopsis>
-<name>MaxRequestsPerChild</name>
-<description>Limit on the number of requests that an individual child server
+<name>MaxConnectionsPerChild</name>
+<description>Limit on the number of connections that an individual child server
 will handle during its life</description>
-<syntax>MaxRequestsPerChild <var>number</var></syntax>
-<default>MaxRequestsPerChild 10000</default>
+<syntax>MaxConnectionsPerChild <var>number</var></syntax>
+<default>MaxConnectionsPerChild 10000</default>
 <contextlist><context>server config</context></contextlist>
 <modulelist><module>mpm_netware</module>
 <module>mpm_winnt</module><module>mpmt_os2</module>
 <module>prefork</module><module>worker</module></modulelist>
+<compatibility>Available Apache HTTP Server 2.3.9 and later. The old name
+<code>MaxRequestsPerChild</code> ist still supported.</compatibility>
 
 <usage>
-    <p>The <directive>MaxRequestsPerChild</directive> directive sets
-    the limit on the number of requests that an individual child
+    <p>The <directive>MaxConnectionsPerChild</directive> directive sets
+    the limit on the number of connections that an individual child
     server process will handle. After
-    <directive>MaxRequestsPerChild</directive> requests, the child
-    process will die. If <directive>MaxRequestsPerChild</directive> is
+    <directive>MaxConnectionsPerChild</directive> connections, the child
+    process will die. If <directive>MaxConnectionsPerChild</directive> is
     <code>0</code>, then the process will never expire.</p>
 
     <note><title>Different default values</title>
@@ -349,16 +351,9 @@ will handle during its life</description>
       <module>mpm_winnt</module> is <code>0</code>.</p>
     </note>
 
-    <p>Setting <directive>MaxRequestsPerChild</directive> to a
+    <p>Setting <directive>MaxConnectionsPerChild</directive> to a
     non-zero value limits the amount of memory that process can consume
     by (accidental) memory leakage.</p>
-
-    <note><title>Note</title>
-      <p>For <directive module="core">KeepAlive</directive> requests, only
-      the first request is counted towards this limit. In effect, it
-      changes the behavior to limit the number of <em>connections</em> per
-      child.</p>
-    </note>
 </usage>
 </directivesynopsis>
 
diff --git a/docs/manual/mod/mpm_netware.xml b/docs/manual/mod/mpm_netware.xml
index 11e4a94f17..5ea65a50f3 100644
--- a/docs/manual/mod/mpm_netware.xml
+++ b/docs/manual/mod/mpm_netware.xml
@@ -55,7 +55,7 @@
     href="../misc/perf-tuning.html">performance hints</a>
     documentation.</p>
 
-    <p><directive module="mpm_common">MaxRequestsPerChild</directive>
+    <p><directive module="mpm_common">MaxConnectionsPerChild</directive>
     controls how frequently the server recycles processes by killing old
     ones and launching new ones. On the NetWare OS it is highly
     recommended that this directive remain set to 0. This allows worker
@@ -71,7 +71,7 @@
 </directivesynopsis>
 <directivesynopsis location="mpm_common"><name>MaxMemFree</name>
 </directivesynopsis>
-<directivesynopsis location="mpm_common"><name>MaxRequestsPerChild</name>
+<directivesynopsis location="mpm_common"><name>MaxConnectionsPerChild</name>
 </directivesynopsis>
 <directivesynopsis location="mpm_common"><name>ReceiveBufferSize</name>
 </directivesynopsis>
diff --git a/docs/manual/mod/mpm_winnt.xml b/docs/manual/mod/mpm_winnt.xml
index eb5d7a22d6..2b5fa4af0d 100644
--- a/docs/manual/mod/mpm_winnt.xml
+++ b/docs/manual/mod/mpm_winnt.xml
@@ -44,7 +44,7 @@ NT.</description>
 </directivesynopsis>
 <directivesynopsis location="mpm_common"><name>ListenBacklog</name>
 </directivesynopsis>
-<directivesynopsis location="mpm_common"><name>MaxRequestsPerChild</name>
+<directivesynopsis location="mpm_common"><name>MaxConnectionsPerChild</name>
 </directivesynopsis>
 <directivesynopsis location="mpm_common"><name>MaxMemFree</name>
 </directivesynopsis>
diff --git a/docs/manual/mod/mpmt_os2.xml b/docs/manual/mod/mpmt_os2.xml
index 81b7fc9d62..c7da33ddfe 100644
--- a/docs/manual/mod/mpmt_os2.xml
+++ b/docs/manual/mod/mpmt_os2.xml
@@ -59,7 +59,7 @@ uses</a></seealso>
 </directivesynopsis>
 <directivesynopsis location="mpm_common"><name>SendBufferSize</name>
 </directivesynopsis>
-<directivesynopsis location="mpm_common"><name>MaxRequestsPerChild</name>
+<directivesynopsis location="mpm_common"><name>MaxConnectionsPerChild</name>
 </directivesynopsis>
 <directivesynopsis location="mpm_common"><name>MaxSpareThreads</name>
 </directivesynopsis>
diff --git a/docs/manual/mod/prefork.xml b/docs/manual/mod/prefork.xml
index 4ffa4d5d73..03c72c755f 100644
--- a/docs/manual/mod/prefork.xml
+++ b/docs/manual/mod/prefork.xml
@@ -81,7 +81,7 @@ uses</a></seealso>
     must be able to read all the content that will be served, but
     should have as few privileges beyond that as possible.</p>
 
-    <p><directive module="mpm_common">MaxRequestsPerChild</directive>
+    <p><directive module="mpm_common">MaxConnectionsPerChild</directive>
     controls how frequently the server recycles processes by killing
     old ones and launching new ones.</p>
 
@@ -108,7 +108,7 @@ uses</a></seealso>
 </directivesynopsis>
 <directivesynopsis location="mpm_common"><name>MaxMemFree</name>
 </directivesynopsis>
-<directivesynopsis location="mpm_common"><name>MaxRequestsPerChild</name>
+<directivesynopsis location="mpm_common"><name>MaxConnectionsPerChild</name>
 </directivesynopsis>
 <directivesynopsis location="mpm_common"><name>ScoreBoardFile</name>
 </directivesynopsis>
diff --git a/docs/manual/mod/worker.xml b/docs/manual/mod/worker.xml
index e2ca80edd8..0e8ae16506 100644
--- a/docs/manual/mod/worker.xml
+++ b/docs/manual/mod/worker.xml
@@ -100,7 +100,7 @@
 
     <ul>
       <li>set the value of <directive module="mpm_common">
-      MaxRequestsPerChild</directive> to zero</li>
+      MaxConnectionsPerChild</directive> to zero</li>
 
       <li>set the value of <directive module="mpm_common">
       MaxSpareThreads</directive> to the same value as
@@ -131,7 +131,7 @@
     these directives also set the privileges which will be inherited
     by CGI scripts.</p>
 
-    <p><directive module="mpm_common">MaxRequestsPerChild</directive>
+    <p><directive module="mpm_common">MaxConnectionsPerChild</directive>
     controls how frequently the server recycles processes by killing
     old ones and launching new ones.</p>
 
@@ -160,7 +160,7 @@
 </directivesynopsis>
 <directivesynopsis location="mpm_common"><name>MaxMemFree</name>
 </directivesynopsis>
-<directivesynopsis location="mpm_common"><name>MaxRequestsPerChild</name>
+<directivesynopsis location="mpm_common"><name>MaxConnectionsPerChild</name>
 </directivesynopsis>
 <directivesynopsis location="mpm_common"><name>MaxSpareThreads</name>
 </directivesynopsis>