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
--- httpd-2.2.8/docs/conf/extra/httpd-mpm.conf.in 2007-12-29 04:08:28.000000000 +0100
+++ httpd-2.2.8-magellan/docs/conf/extra/httpd-mpm.conf.in 2008-03-15 22:39:33.000000000 +0100
@@ -8,18 +8,12 @@
#
# Note that this is the default PidFile for most MPMs.
#
-
- PidFile "@rel_runtimedir@/httpd.pid"
-
+PidFile /var/run/apache2.pid
#
# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
#
-
-
-LockFile "@rel_logfiledir@/accept.lock"
-
-
+LockFile /var/run/apache2.lock
#
# Only one of the below sections will be relevant on your
@@ -57,54 +51,4 @@
MaxRequestsPerChild 0
-# BeOS MPM
-# StartThreads: how many threads do we initially spawn?
-# MaxClients: max number of threads we can have (1 thread == 1 client)
-# MaxRequestsPerThread: maximum number of requests each thread will process
-
- StartThreads 10
- MaxClients 50
- MaxRequestsPerThread 10000
-
-
-# NetWare MPM
-# ThreadStackSize: Stack size allocated for each worker thread
-# StartThreads: Number of worker threads launched at server startup
-# MinSpareThreads: Minimum number of idle threads, to handle request spikes
-# MaxSpareThreads: Maximum number of idle threads
-# MaxThreads: Maximum number of worker threads alive at the same time
-# MaxRequestsPerChild: Maximum number of requests a thread serves. It is
-# recommended that the default value of 0 be set for this
-# directive on NetWare. This will allow the thread to
-# continue to service requests indefinitely.
-
- ThreadStackSize 65536
- StartThreads 250
- MinSpareThreads 25
- MaxSpareThreads 250
- MaxThreads 1000
- MaxRequestsPerChild 0
- MaxMemFree 100
-
-
-# OS/2 MPM
-# StartServers: Number of server processes to maintain
-# MinSpareThreads: Minimum number of idle threads per process,
-# to handle request spikes
-# MaxSpareThreads: Maximum number of idle threads per process
-# MaxRequestsPerChild: Maximum number of connections per server process
-
- StartServers 2
- MinSpareThreads 5
- MaxSpareThreads 10
- MaxRequestsPerChild 0
-
-
-# WinNT MPM
-# ThreadsPerChild: constant number of worker threads in the server process
-# MaxRequestsPerChild: maximum number of requests a server process serves
-
- ThreadsPerChild 150
- MaxRequestsPerChild 0
-