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