Contents of /trunk/apache2/patches/apache2-2.4.3-default-mpm-settings.patch
Parent Directory | Revision Log
Revision 1928 -
(show annotations)
(download)
Wed Oct 31 11:33:28 2012 UTC (11 years, 10 months ago) by niro
File size: 2601 byte(s)
Wed Oct 31 11:33:28 2012 UTC (11 years, 10 months ago) by niro
File size: 2601 byte(s)
-rediffed patches and added mod_systemd patch
1 | --- httpd-2.4.3/docs/conf/extra/httpd-mpm.conf.in 2012-08-14 23:59:24.000000000 +0000 |
2 | +++ httpd-2.4.3-magellan/docs/conf/extra/httpd-mpm.conf.in 2012-10-31 12:34:47.132526047 +0000 |
3 | @@ -8,9 +8,7 @@ |
4 | # |
5 | # Note that this is the default PidFile for most MPMs. |
6 | # |
7 | -<IfModule !mpm_netware_module> |
8 | - PidFile "@rel_runtimedir@/httpd.pid" |
9 | -</IfModule> |
10 | +PidFile "/run/apache2/apache2.pid" |
11 | |
12 | # |
13 | # Only one of the below sections will be relevant on your |
14 | @@ -67,53 +65,8 @@ |
15 | MaxConnectionsPerChild 0 |
16 | </IfModule> |
17 | |
18 | -# NetWare MPM |
19 | -# ThreadStackSize: Stack size allocated for each worker thread |
20 | -# StartThreads: Number of worker threads launched at server startup |
21 | -# MinSpareThreads: Minimum number of idle threads, to handle request spikes |
22 | -# MaxSpareThreads: Maximum number of idle threads |
23 | -# MaxThreads: Maximum number of worker threads alive at the same time |
24 | -# MaxConnectionsPerChild: Maximum number of connections a thread serves. It |
25 | -# is recommended that the default value of 0 be set |
26 | -# for this directive on NetWare. This will allow the |
27 | -# thread to continue to service requests indefinitely. |
28 | -<IfModule mpm_netware_module> |
29 | - ThreadStackSize 65536 |
30 | - StartThreads 250 |
31 | - MinSpareThreads 25 |
32 | - MaxSpareThreads 250 |
33 | - MaxThreads 1000 |
34 | - MaxConnectionsPerChild 0 |
35 | -</IfModule> |
36 | - |
37 | -# OS/2 MPM |
38 | -# StartServers: Number of server processes to maintain |
39 | -# MinSpareThreads: Minimum number of idle threads per process, |
40 | -# to handle request spikes |
41 | -# MaxSpareThreads: Maximum number of idle threads per process |
42 | -# MaxConnectionsPerChild: Maximum number of connections per server process |
43 | -<IfModule mpm_mpmt_os2_module> |
44 | - StartServers 2 |
45 | - MinSpareThreads 5 |
46 | - MaxSpareThreads 10 |
47 | - MaxConnectionsPerChild 0 |
48 | -</IfModule> |
49 | - |
50 | -# WinNT MPM |
51 | -# ThreadsPerChild: constant number of worker threads in the server process |
52 | -# MaxConnectionsPerChild: maximum number of connections a server process serves |
53 | -<IfModule mpm_winnt_module> |
54 | - ThreadsPerChild 150 |
55 | - MaxConnectionsPerChild 0 |
56 | -</IfModule> |
57 | - |
58 | # The maximum number of free Kbytes that every allocator is allowed |
59 | # to hold without calling free(). In threaded MPMs, every thread has its own |
60 | # allocator. When not set, or when set to zero, the threshold will be set to |
61 | # unlimited. |
62 | -<IfModule !mpm_netware_module> |
63 | - MaxMemFree 2048 |
64 | -</IfModule> |
65 | -<IfModule mpm_netware_module> |
66 | - MaxMemFree 100 |
67 | -</IfModule> |
68 | +MaxMemFree 2048 |