summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Fritsch <sf@debian.org>2010-02-20 10:35:00 +0000
committerStefan Fritsch <sf@sfritsch.de>2012-01-02 10:37:06 +0100
commit5def3263730db0cbae990ae6e577a98bcba2e081 (patch)
tree56ac95bc65ccf2ec956c4a4a722cbe87471ca595
parent018898741bcfd9c08bef1a711a848e68aeb3df23 (diff)
downloadapache2-5def3263730db0cbae990ae6e577a98bcba2e081.tar.gz
Document ThreadLimit in apache2.conf's comments
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@1150 01b336ce-410b-0410-9a02-a0e7f243c266
-rw-r--r--debian/changelog1
-rw-r--r--debian/config-dir/apache2.conf3
2 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index d6379a97..bd87c755 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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@debian.org> Fri, 19 Feb 2010 19:02:32 +0100
diff --git a/debian/config-dir/apache2.conf b/debian/config-dir/apache2.conf
index a0d51991..9e98d619 100644
--- a/debian/config-dir/apache2.conf
+++ b/debian/config-dir/apache2.conf
@@ -108,6 +108,9 @@ KeepAliveTimeout 15
# 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>