summaryrefslogtreecommitdiffstats
path: root/docs/conf
diff options
context:
space:
mode:
authorStefan Fritsch <sf@apache.org>2011-11-12 02:54:50 +0100
committerStefan Fritsch <sf@apache.org>2011-11-12 02:54:50 +0100
commit253d865fe4c5d14985164697f91d6192646297ea (patch)
tree655a5f771f17f733ec43ce81d830976dce5557ed /docs/conf
parentFix assertion failure during very high load by preventing race condition (diff)
downloadapache2-253d865fe4c5d14985164697f91d6192646297ea.tar.xz
apache2-253d865fe4c5d14985164697f91d6192646297ea.zip
Set MaxMemFree 2048 by default
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1201158 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs/conf')
-rw-r--r--docs/conf/extra/httpd-mpm.conf.in11
1 files changed, 10 insertions, 1 deletions
diff --git a/docs/conf/extra/httpd-mpm.conf.in b/docs/conf/extra/httpd-mpm.conf.in
index 3bd919a275..4286ded333 100644
--- a/docs/conf/extra/httpd-mpm.conf.in
+++ b/docs/conf/extra/httpd-mpm.conf.in
@@ -92,7 +92,6 @@
MaxSpareThreads 250
MaxThreads 1000
MaxConnectionsPerChild 0
- MaxMemFree 100
</IfModule>
# OS/2 MPM
@@ -116,3 +115,13 @@
MaxConnectionsPerChild 0
</IfModule>
+# The maximum number of free Kbytes that every allocator is allowed
+# to hold without calling free(). In threaded MPMs, every thread has its own
+# allocator. When not set, or when set to zero, the threshold will be set to
+# unlimited.
+<IfModule !mpm_netware_module>
+ MaxMemFree 2048
+</IfModule>
+<IfModule mpm_netware_module>
+ MaxMemFree 100
+</IfModule>