From 82a72d93d81109edb64dd4322c92dc6cb1aaf976 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 5 Sep 2011 13:26:17 +0000
Subject: [PATCH] Fixed: FS#1723 - fastcgi FcgidIdleTimeout Replaced old
 variable names with new ones used in apache 2, see here for reference:
 http://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html

---
 server/conf/vhost.conf.master | 41 +++++++++++++++++------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 1dc62b211e..3356fb3a5e 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -153,42 +153,42 @@
       
 	  # SocketPath /tmp/fcgid_sock/
 	  
-	  # IdleTimeout n (3600 seconds)
+	  # IdleTimeout n (300 seconds)
 	  # An idle fastcgi application will be terminated after IdleTimeout seconds.
-      IdleTimeout 3600
+	  FcgidIdleTimeout 300
 	  
-	  # ProcessLifeTime n (7200 seconds)
+	  # ProcessLifeTime n (3600 seconds)
       # A fastcgi application will be terminated if lifetime expired, even no error is detected.
-      ProcessLifeTime 7200
+      FcgidProcessLifeTime 3600
 	  
 	  # MaxProcessCount n (1000)
       # The max count of total fastcgi process count.
-      # MaxProcessCount 1000
+      # FcgidMaxProcesses 1000
       
 	  # DefaultMinClassProcessCount n (3)
       # The minimum number of fastcgi application instances for any one fastcgi application.
       # Idle fastcgi will not be killed if their count is less than n
       # Set this to 0, and tweak IdleTimeout
-	  DefaultMinClassProcessCount 0
+	  FcgidMinProcessesPerClass 0
 	  
 	  # DefaultMaxClassProcessCount n (100)
       # The maximum number of fastcgi application instances allowed to run for
       # particular one fastcgi application.
-      DefaultMaxClassProcessCount 100
+      FcgidMaxProcessesPerClass 100
 	  
 	  # IPCConnectTimeout n (3 seconds)
       # The connect timeout to a fastcgi application.
-      IPCConnectTimeout 8
+      FcgidConnectTimeout 3
 	  
 	  # IPCCommTimeout n (20 seconds)
       # The communication timeout to a fastcgi application. Please increase this
       # value if your CGI have a slow initialization or slow respond.
-      IPCCommTimeout 360
+      FcgidIOTimeout 360
       
 	  # BusyTimeout n (300 seconds)
       # A fastcgi application will be terminated if handing a single request
       # longer than busy timeout.
-	  BusyTimeout 300
+	  FcgidBusyTimeout 300
 	  
     </IfModule>
     <Directory {tmpl_var name='web_document_root_www'}>
@@ -378,43 +378,42 @@
 <tmpl_if name='php' op='==' value='fast-cgi'>
     # php as fast-cgi enabled
     <IfModule mod_fcgid.c>
-      # SocketPath /tmp/fcgid_sock/
-	  # IdleTimeout n (3600 seconds)
+	  # IdleTimeout n (300 seconds)
 	  # An idle fastcgi application will be terminated after IdleTimeout seconds.
-      IdleTimeout 3600
+	  FcgidIdleTimeout 300
 	  
-	  # ProcessLifeTime n (7200 seconds)
+	  # ProcessLifeTime n (3600 seconds)
       # A fastcgi application will be terminated if lifetime expired, even no error is detected.
-      ProcessLifeTime 7200
+      FcgidProcessLifeTime 3600
 	  
 	  # MaxProcessCount n (1000)
       # The max count of total fastcgi process count.
-      # MaxProcessCount 1000
+      # FcgidMaxProcesses 1000
       
 	  # DefaultMinClassProcessCount n (3)
       # The minimum number of fastcgi application instances for any one fastcgi application.
       # Idle fastcgi will not be killed if their count is less than n
       # Set this to 0, and tweak IdleTimeout
-	  DefaultMinClassProcessCount 0
+	  FcgidMinProcessesPerClass 0
 	  
 	  # DefaultMaxClassProcessCount n (100)
       # The maximum number of fastcgi application instances allowed to run for
       # particular one fastcgi application.
-      DefaultMaxClassProcessCount 100
+      FcgidMaxProcessesPerClass 100
 	  
 	  # IPCConnectTimeout n (3 seconds)
       # The connect timeout to a fastcgi application.
-      IPCConnectTimeout 8
+      FcgidConnectTimeout 3
 	  
 	  # IPCCommTimeout n (20 seconds)
       # The communication timeout to a fastcgi application. Please increase this
       # value if your CGI have a slow initialization or slow respond.
-      IPCCommTimeout 360
+      FcgidIOTimeout 360
       
 	  # BusyTimeout n (300 seconds)
       # A fastcgi application will be terminated if handing a single request
       # longer than busy timeout.
-	  BusyTimeout 300
+	  FcgidBusyTimeout 300
 	  
     </IfModule>
     <Directory {tmpl_var name='web_document_root_www'}>
-- 
GitLab