[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. 64c0c434c521aacb52b8b245416a5be5f0aaa256

[Stefan Fritsch]

The following commit has been merged in the next branch:
commit d399ff931d055da319792d8e04929c7688ff6f6e
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sun Mar 18 00:38:53 2012 +0100

    Use new names for MaxClients and MaxRequestsPerChild

diff --git a/debian/config-dir/mods-available/mpm_event.conf b/debian/config-dir/mods-available/mpm_event.conf
index 21e460c..6e51df9 100644
--- a/debian/config-dir/mods-available/mpm_event.conf
+++ b/debian/config-dir/mods-available/mpm_event.conf
@@ -3,15 +3,14 @@
 # MinSpareThreads: minimum number of worker threads which are kept spare
 # MaxSpareThreads: maximum number of worker threads which are kept spare
 # ThreadsPerChild: constant number of worker threads in each server process
-# MaxClients: maximum number of simultaneous client connections
-# MaxRequestsPerChild: maximum number of requests a server process serves
+# MaxRequestWorkers: maximum number of worker threads
+# MaxConnectionsPerChild: maximum number of requests a server process serves
 <IfModule mpm_event_module>
-    StartServers          2
-    MinSpareThreads      25
-    MaxSpareThreads      75 
-    ThreadLimit          64
-    ThreadsPerChild      25
-    MaxClients          150
-    MaxRequestsPerChild   0
+    StartServers             2
+    MinSpareThreads         25
+    MaxSpareThreads         75
+    ThreadLimit             64
+    ThreadsPerChild         25
+    MaxRequestWorkers      150
+    MaxConnectionsPerChild   0
 </IfModule>
-
diff --git a/debian/config-dir/mods-available/mpm_prefork.conf b/debian/config-dir/mods-available/mpm_prefork.conf
index d61ee1a..300caff 100644
--- a/debian/config-dir/mods-available/mpm_prefork.conf
+++ b/debian/config-dir/mods-available/mpm_prefork.conf
@@ -2,14 +2,13 @@
 # StartServers: number of server processes to start
 # MinSpareServers: minimum number of server processes which are kept spare
 # MaxSpareServers: maximum number of server processes which are kept spare
-# MaxClients: maximum number of server processes allowed to start
-# MaxRequestsPerChild: maximum number of requests a server process serves
+# MaxRequestWorkers: maximum number of server processes allowed to start
+# MaxConnectionsPerChild: maximum number of requests a server process serves
 
 <IfModule mpm_prefork_module>
-    StartServers          5
-    MinSpareServers       5
-    MaxSpareServers      10
-    MaxClients          150
-    MaxRequestsPerChild   0
+    StartServers             5
+    MinSpareServers          5
+    MaxSpareServers         10
+    MaxRequestWorkers      150
+    MaxConnectionsPerChild   0
 </IfModule>
-
diff --git a/debian/config-dir/mods-available/mpm_worker.conf b/debian/config-dir/mods-available/mpm_worker.conf
index 3f77f11..5840118 100644
--- a/debian/config-dir/mods-available/mpm_worker.conf
+++ b/debian/config-dir/mods-available/mpm_worker.conf
@@ -6,16 +6,15 @@
 #              graceful restart. ThreadLimit can only be changed by stopping
 #              and starting Apache.
 # ThreadsPerChild: constant number of worker threads in each server process
-# MaxClients: maximum number of simultaneous client connections
-# MaxRequestsPerChild: maximum number of requests a server process serves
+# MaxRequestWorkers: maximum number of threads
+# MaxConnectionsPerChild: maximum number of requests a server process serves
 
 <IfModule mpm_worker_module>
-    StartServers          2
-    MinSpareThreads      25
-    MaxSpareThreads      75 
-    ThreadLimit          64
-    ThreadsPerChild      25
-    MaxClients          150
-    MaxRequestsPerChild   0
+    StartServers             2
+    MinSpareThreads         25
+    MaxSpareThreads         75
+    ThreadLimit             64
+    ThreadsPerChild         25
+    MaxRequestWorkers      150
+    MaxConnectionsPerChild   0
 </IfModule>
-

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)