[Pkg-apache-commits] r1006 - in /trunk/apache2: changelog config-dir/apache2.conf

[sf at alioth.debian.org]

Author: sf
Date: Tue Jul 28 13:28:54 2009
New Revision: 1006

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1006
Log:
Add ThreadLimit to the default config and put ThreadsPerChild and
MaxClients into the correct order so that Apache does not complain.
Also add a configuration block for the event MPM in apache2.conf.


Modified:
    trunk/apache2/changelog
    trunk/apache2/config-dir/apache2.conf

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1006&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Tue Jul 28 13:28:54 2009
@@ -14,6 +14,10 @@
     included config files, even if LANG is not C.
   * Ship our own version of the magic config file (taken from file 4.17-5etch3)
     which is still compatible with mod_mime_magic (closes: #483111).
+  * Add ThreadLimit to the default config and put ThreadsPerChild and
+    MaxClients into the correct order so that Apache does not complain
+    (closes: #495656).
+    Also add a configuration block for the event MPM in apache2.conf.
   * Change references to httpd.conf in apache2-doc to apache2.conf
     (closes: #465393).
   * Clarify the recommended permissions for SSL certificates in README.Debian

Modified: trunk/apache2/config-dir/apache2.conf
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/config-dir/apache2.conf?rev=1006&op=diff
==============================================================================
--- trunk/apache2/config-dir/apache2.conf (original)
+++ trunk/apache2/config-dir/apache2.conf Tue Jul 28 13:28:54 2009
@@ -116,9 +116,27 @@
 # MaxRequestsPerChild: 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
+</IfModule>
+
+# event MPM
+# StartServers: initial number of server processes to start
+# MaxClients: maximum number of simultaneous client connections
+# 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
+# MaxRequestsPerChild: maximum number of requests a server process serves
+<IfModule mpm_event_module>
+    StartServers          2
     MaxClients          150
     MinSpareThreads      25
     MaxSpareThreads      75 
+    ThreadLimit          64
     ThreadsPerChild      25
     MaxRequestsPerChild   0
 </IfModule>