Annotation of /trunk/apache2/patches/apache2-2.2.8-default-mpm-settings.patch
Parent Directory
| 
Revision Log
Revision 502 -
(hide annotations)
(download)
Sat Mar 15 21:36:06 2008 UTC (16 years, 3 months ago) by niro
File size: 2909 byte(s)
Sat Mar 15 21:36:06 2008 UTC (16 years, 3 months ago) by niro
File size: 2909 byte(s)
-re-diffed against 2.2.8
| 1 | niro | 502 | diff -Naur httpd-2.2.8/docs/conf/extra/httpd-mpm.conf.in httpd-2.2.8-magellan/docs/conf/extra/httpd-mpm.conf.in |
| 2 | --- httpd-2.2.8/docs/conf/extra/httpd-mpm.conf.in 2007-12-29 04:08:28.000000000 +0100 | ||
| 3 | +++ httpd-2.2.8-magellan/docs/conf/extra/httpd-mpm.conf.in 2008-03-15 22:39:33.000000000 +0100 | ||
| 4 | @@ -8,18 +8,12 @@ | ||
| 5 | # | ||
| 6 | # Note that this is the default PidFile for most MPMs. | ||
| 7 | # | ||
| 8 | -<IfModule !mpm_netware_module> | ||
| 9 | - PidFile "@rel_runtimedir@/httpd.pid" | ||
| 10 | -</IfModule> | ||
| 11 | +PidFile /var/run/apache2.pid | ||
| 12 | |||
| 13 | # | ||
| 14 | # The accept serialization lock file MUST BE STORED ON A LOCAL DISK. | ||
| 15 | # | ||
| 16 | -<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 | |||
| 23 | # | ||
| 24 | # Only one of the below sections will be relevant on your | ||
| 25 | @@ -57,54 +51,4 @@ | ||
| 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> | ||
| 71 | - | ||
| 72 | -# WinNT MPM | ||
| 73 | -# ThreadsPerChild: constant number of worker threads in the server process | ||
| 74 | -# MaxRequestsPerChild: maximum number of requests a server process serves | ||
| 75 | -<IfModule mpm_winnt_module> | ||
| 76 | - ThreadsPerChild 150 | ||
| 77 | - MaxRequestsPerChild 0 | ||
| 78 | -</IfModule> | ||
| 79 |