From ddb461f596d9f013afe4f215fabc0eabc62b1fb0 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 07 Jan 2014 10:28:05 -0500
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'
---
server/conf/vhost.conf.master | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index cf33b6f..5d74512 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -205,8 +205,8 @@
FcgidMinProcessesPerClass 0
FcgidMaxProcessesPerClass 100
FcgidConnectTimeout 3
- FcgidIOTimeout 360
- FcgidBusyTimeout 300
+ FcgidIOTimeout 600
+ FcgidBusyTimeout 3600
FcgidMaxRequestLen 1073741824
<tmpl_else>
IdleTimeout 300
@@ -215,8 +215,8 @@
DefaultMinClassProcessCount 0
DefaultMaxClassProcessCount 100
IPCConnectTimeout 3
- IPCCommTimeout 360
- BusyTimeout 300
+ IPCCommTimeout 600
+ BusyTimeout 3600
</tmpl_if>
</IfModule>
<Directory {tmpl_var name='web_document_root_www'}>
--
Gitblit v1.9.1