Annotation of /trunk/apache2/patches/apache2-2.2.6-default-mpm-settings.patch
Parent Directory | Revision Log
Revision 339 -
(hide annotations)
(download)
Fri Sep 7 17:46:04 2007 UTC (16 years, 8 months ago) by niro
File size: 2638 byte(s)
Fri Sep 7 17:46:04 2007 UTC (16 years, 8 months ago) by niro
File size: 2638 byte(s)
-re-diffed for apache2-2.2.6
1 | niro | 339 | diff -Naur httpd-2.2.6/docs/conf/extra/httpd-mpm.conf.in httpd-2.2.6-magellan/docs/conf/extra/httpd-mpm.conf.in |
2 | --- httpd-2.2.6/docs/conf/extra/httpd-mpm.conf.in 2007-09-07 19:46:13.000000000 +0200 | ||
3 | +++ httpd-2.2.6-magellan/docs/conf/extra/httpd-mpm.conf.in 2007-03-07 08:33:58.000000000 +0100 | ||
4 | @@ -8,12 +8,18 @@ | ||
5 | # | ||
6 | # Note that this is the default PidFile for most MPMs. | ||
7 | # | ||
8 | -PidFile /var/run/apache2.pid | ||
9 | +<IfModule !mpm_netware_module> | ||
10 | + PidFile "@rel_runtimedir@/httpd.pid" | ||
11 | +</IfModule> | ||
12 | |||
13 | # | ||
14 | # The accept serialization lock file MUST BE STORED ON A LOCAL DISK. | ||
15 | # | ||
16 | -LockFile /var/run/apache2.lock | ||
17 | +<IfModule !mpm_winnt_module> | ||
18 | +<IfModule !mpm_netware_module> | ||
19 | +LockFile "@rel_logfiledir@/accept.lock" | ||
20 | +</IfModule> | ||
21 | +</IfModule> | ||
22 | |||
23 | # | ||
24 | # Only one of the below sections will be relevant on your | ||
25 | @@ -51,3 +57,45 @@ | ||
26 | MaxRequestsPerChild 0 | ||
27 | </IfModule> | ||
28 | |||
29 | +# BeOS MPM | ||
30 | +# StartThreads: how many threads do we initially spawn? | ||
31 | +# MaxClients: max number of threads we can have (1 thread == 1 client) | ||
32 | +# MaxRequestsPerThread: maximum number of requests each thread will process | ||
33 | +<IfModule mpm_beos_module> | ||
34 | + StartThreads 10 | ||
35 | + MaxClients 50 | ||
36 | + MaxRequestsPerThread 10000 | ||
37 | +</IfModule> | ||
38 | + | ||
39 | +# NetWare MPM | ||
40 | +# ThreadStackSize: Stack size allocated for each worker thread | ||
41 | +# StartThreads: Number of worker threads launched at server startup | ||
42 | +# MinSpareThreads: Minimum number of idle threads, to handle request spikes | ||
43 | +# MaxSpareThreads: Maximum number of idle threads | ||
44 | +# MaxThreads: Maximum number of worker threads alive at the same time | ||
45 | +# MaxRequestsPerChild: Maximum number of requests a thread serves. It is | ||
46 | +# recommended that the default value of 0 be set for this | ||
47 | +# directive on NetWare. This will allow the thread to | ||
48 | +# continue to service requests indefinitely. | ||
49 | +<IfModule mpm_netware_module> | ||
50 | + ThreadStackSize 65536 | ||
51 | + StartThreads 250 | ||
52 | + MinSpareThreads 25 | ||
53 | + MaxSpareThreads 250 | ||
54 | + MaxThreads 1000 | ||
55 | + MaxRequestsPerChild 0 | ||
56 | + MaxMemFree 100 | ||
57 | +</IfModule> | ||
58 | + | ||
59 | +# OS/2 MPM | ||
60 | +# StartServers: Number of server processes to maintain | ||
61 | +# MinSpareThreads: Minimum number of idle threads per process, | ||
62 | +# to handle request spikes | ||
63 | +# MaxSpareThreads: Maximum number of idle threads per process | ||
64 | +# MaxRequestsPerChild: Maximum number of connections per server process | ||
65 | +<IfModule mpm_mpmt_os2_module> | ||
66 | + StartServers 2 | ||
67 | + MinSpareThreads 5 | ||
68 | + MaxSpareThreads 10 | ||
69 | + MaxRequestsPerChild 0 | ||
70 | +</IfModule> |