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