- these are now common directives

[packages/apache.git] / apache-mpm.conf

diff --git a/apache-mpm.conf b/apache-mpm.conf
index 63ca63d37ce320e913042bc198f05ddc3ae6e42d..79ce51a256d43c2bd05a9d95aac6c3a904e198e2 100644 (file)
--- a/apache-mpm.conf
+++ b/apache-mpm.conf
@@ -17,7 +17,7 @@ PidFile /var/run/httpd.pid
 #
 # The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
 #
-LockFile /var/run/httpd/accept.lock
+Mutex file:/var/run/httpd/
 
 #
 # Only one of the below sections will be relevant on your
@@ -25,32 +25,15 @@ LockFile /var/run/httpd/accept.lock
 # active mpm.
 #
 
-# prefork MPM
 # StartServers: number of server processes to start
-# MinSpareServers: minimum number of server processes which are kept spare
-# MaxSpareServers: maximum number of server processes which are kept spare
-# MaxClients: maximum number of server processes allowed to start
+# MinSpareThreads: minimum number of server processes which are kept spare
+# MaxSpareThreads: maximum number of server processes which are kept spare
+# MaxRequestWorkers: Maximum number of connections that will be processed simultaneously
 # MaxRequestsPerChild: maximum number of requests a server process serves
-<IfModule mpm_prefork_module>
-       StartServers              5
-       MinSpareServers           5
-       MaxSpareServers          10
-       MaxClients                      150
-       MaxRequestsPerChild   0
-</IfModule>
 
-# worker MPM
-# StartServers: initial number of server processes to start
-# MaxClients: maximum number of simultaneous client connections
-# MinSpareThreads: minimum number of worker threads which are kept spare
-# MaxSpareThreads: maximum number of worker threads which are kept spare
-# ThreadsPerChild: constant number of worker threads in each server process
-# MaxRequestsPerChild: maximum number of requests a server process serves
-<IfModule mpm_worker_module>
-       StartServers            2
-       MaxClients                      150
-       MinSpareThreads         25
-       MaxSpareThreads         75
-       ThreadsPerChild         25
-       MaxRequestsPerChild     0
-</IfModule>
+StartServers             5
+MinSpareServers                  5
+MaxSpareServers                 10
+MaxRequestWorkers      150
+ThreadsPerChild        25
+#MaxConnectionsPerChild        0