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

[sf at alioth.debian.org]

Author: sf
Date: Sun Feb  6 14:54:53 2011
New Revision: 1271

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1271
Log:
* Fix order of comments in "worker" section in apache2.conf. Closes: #608488

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=1271&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Sun Feb  6 14:54:53 2011
@@ -1,6 +1,7 @@
 apache2 (2.2.17-1) UNRELEASED; urgency=low
 
   * New upstream version
+  * Fix order of comments in "worker" section in apache2.conf. Closes: #608488
 
  -- Stefan Fritsch <sf at debian.org>  Sun, 06 Feb 2011 15:23:35 +0100
 

Modified: trunk/apache2/config-dir/apache2.conf
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/config-dir/apache2.conf?rev=1271&op=diff
==============================================================================
--- trunk/apache2/config-dir/apache2.conf (original)
+++ trunk/apache2/config-dir/apache2.conf Sun Feb  6 14:54:53 2011
@@ -105,13 +105,13 @@
 
 # worker 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
 # ThreadLimit: ThreadsPerChild can be changed to this maximum value during a
 #              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
 <IfModule mpm_worker_module>
     StartServers          2
@@ -125,18 +125,18 @@
 
 # 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
+# MaxClients: maximum number of simultaneous client connections
 # 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
+    MaxClients          150
     MaxRequestsPerChild   0
 </IfModule>