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

[sf at alioth.debian.org]

Author: sf
Date: Sat Feb 20 10:35:00 2010
New Revision: 1150

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1150
Log:
Document ThreadLimit in apache2.conf's comments

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=1150&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Sat Feb 20 10:35:00 2010
@@ -1,6 +1,7 @@
 apache2 (2.2.14-7) UNRELEASED; urgency=low
 
   * Fix potential memory leaks related to the usage of apr_brigade_destroy().
+  * Document ThreadLimit in apache2.conf's comments.
 
  -- Stefan Fritsch <sf at debian.org>  Fri, 19 Feb 2010 19:02:32 +0100
 

Modified: trunk/apache2/config-dir/apache2.conf
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/config-dir/apache2.conf?rev=1150&op=diff
==============================================================================
--- trunk/apache2/config-dir/apache2.conf (original)
+++ trunk/apache2/config-dir/apache2.conf Sat Feb 20 10:35:00 2010
@@ -108,6 +108,9 @@
 # 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
 # MaxRequestsPerChild: maximum number of requests a server process serves
 <IfModule mpm_worker_module>