From: Bartosz Świątek <shadzik@tld-linux.org>
Date: Sat, 25 Feb 2012 15:26:42 +0000 (+0100)
Subject: - these are now common directives
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=794f6ac1ffdb2507154aaec3af62d218bc29b81f;p=packages%2Fapache.git

- these are now common directives
---

diff --git a/apache-mpm.conf b/apache-mpm.conf
index 033073b..79ce51a 100644
--- a/apache-mpm.conf
+++ b/apache-mpm.conf
@@ -25,32 +25,15 @@ Mutex file:/var/run/httpd/
 # 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