From 8fe84f94c3b85abf51beef40ab0d03fb9bf71382 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 06 Sep 2011 06:51:26 -0400
Subject: [PATCH]
---
server/conf/vhost.conf.master | 52 ++++++++++++----------------------------------------
interface/web/admin/form/server_config.tform.php | 2 +-
2 files changed, 13 insertions(+), 41 deletions(-)
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index 5badcad..38d282b 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -690,7 +690,7 @@
'datatype' => 'INTEGER',
'formtype' => 'SELECT',
'default' => '2',
- 'value' => array('1' => 'Old', '2' => 'New'),
+ 'value' => array('1' => 'Old (apache 2.0)', '2' => 'New (apache 2.2)'),
'width' => '40',
'maxlength' => '255'
),
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index f9cfb39..c1e0ff8 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -149,55 +149,27 @@
</tmpl_if>
<tmpl_if name='php' op='==' value='fast-cgi'>
# php as fast-cgi enabled
+ # For config options see: http://httpd.apache.org/mod_fcgid/mod/mod_fcgid.html
<IfModule mod_fcgid.c>
-
- # SocketPath /tmp/fcgid_sock/
-
- # IdleTimeout n (300 seconds)
- # An idle fastcgi application will be terminated after IdleTimeout seconds.
- # FcgidIdleTimeout 300
+ <tmpl_if name='fastcgi_config_syntax' op='==' value='1'>
IdleTimeout 300
-
- # ProcessLifeTime n (3600 seconds)
- # A fastcgi application will be terminated if lifetime expired, even no error is detected.
- # FcgidProcessLifeTime 3600
ProcessLifeTime 3600
-
- # MaxProcessCount n (1000)
- # The max count of total fastcgi process count.
- # FcgidMaxProcesses 1000
MaxProcessCount 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
- # FcgidMinProcessesPerClass 0
DefaultMinClassProcessCount 0
-
- # DefaultMaxClassProcessCount n (100)
- # The maximum number of fastcgi application instances allowed to run for
- # particular one fastcgi application.
- # FcgidMaxProcessesPerClass 100
DefaultMaxClassProcessCount 100
-
- # IPCConnectTimeout n (3 seconds)
- # The connect timeout to a fastcgi application.
- # FcgidConnectTimeout 3
IPCConnectTimeout 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.
- # FcgidIOTimeout 360
IPCCommTimeout 360
-
- # BusyTimeout n (300 seconds)
- # A fastcgi application will be terminated if handing a single request
- # longer than busy timeout.
- # FcgidBusyTimeout 300
BusyTimeout 300
-
+ <tmpl_else>
+ FcgidIdleTimeout 300
+ FcgidProcessLifeTime 3600
+ FcgidMaxProcesses 1000
+ FcgidMinProcessesPerClass 0
+ FcgidMaxProcessesPerClass 100
+ FcgidConnectTimeout 3
+ FcgidIOTimeout 360
+ FcgidBusyTimeout 300
+ </tmpl_if>
</IfModule>
<Directory {tmpl_var name='web_document_root_www'}>
AddHandler fcgid-script .php .php3 .php4 .php5
--
Gitblit v1.9.1