diff options
| author | Stefan Fritsch <sf@apache.org> | 2011-11-12 02:54:50 +0100 |
|---|---|---|
| committer | Stefan Fritsch <sf@apache.org> | 2011-11-12 02:54:50 +0100 |
| commit | 253d865fe4c5d14985164697f91d6192646297ea (patch) | |
| tree | 655a5f771f17f733ec43ce81d830976dce5557ed /docs | |
| parent | Fix assertion failure during very high load by preventing race condition (diff) | |
| download | apache2-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')
| -rw-r--r-- | docs/conf/extra/httpd-mpm.conf.in | 11 | ||||
| -rw-r--r-- | docs/manual/mod/mpm_common.xml | 7 |
2 files changed, 14 insertions, 4 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> diff --git a/docs/manual/mod/mpm_common.xml b/docs/manual/mod/mpm_common.xml index 3a5031628b..e979555795 100644 --- a/docs/manual/mod/mpm_common.xml +++ b/docs/manual/mod/mpm_common.xml @@ -327,7 +327,7 @@ simultaneously</description> <description>Maximum amount of memory that the main allocator is allowed to hold without calling <code>free()</code></description> <syntax>MaxMemFree <var>KBytes</var></syntax> -<default>MaxMemFree 0</default> +<default>MaxMemFree 2048</default> <contextlist><context>server config</context></contextlist> <modulelist><module>event</module><module>mpm_netware</module> <module>prefork</module><module>worker</module><module>mpm_winnt</module> @@ -335,8 +335,9 @@ to hold without calling <code>free()</code></description> <usage> <p>The <directive>MaxMemFree</directive> directive sets the - maximum number of free Kbytes that the main allocator is allowed - to hold without calling <code>free()</code>. When not set, or when set + maximum number of free Kbytes that every allocator is allowed + to hold without calling <code>free()</code>. In threaded MPMs, every + thread has its own allocator. When not set, or when set to zero, the threshold will be set to unlimited.</p> </usage> </directivesynopsis> |