From 10b4c85a7686da07bddb5779f8ceea48acdf412e Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 03 Jan 2013 06:51:45 -0500
Subject: [PATCH] Merged revisons 3687-3748 from 3.0.5 stable branch.

---
 install/tpl/apache_ispconfig.vhost.master |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master
index 4d59dfe..0385427 100644
--- a/install/tpl/apache_ispconfig.vhost.master
+++ b/install/tpl/apache_ispconfig.vhost.master
@@ -25,6 +25,7 @@
       Order allow,deny
       Allow from all
     </Directory>
+    IPCCommTimeout  7200
   </IfModule>
   
 #  <IfModule mod_php5.c>
@@ -52,6 +53,7 @@
   {ssl_comment}SSLEngine On
   {ssl_comment}SSLCertificateFile /usr/local/ispconfig/interface/ssl/ispserver.crt
   {ssl_comment}SSLCertificateKeyFile /usr/local/ispconfig/interface/ssl/ispserver.key
+  {ssl_bundle_comment}SSLCACertificateFile /usr/local/ispconfig/interface/ssl/ispserver.bundle
 
 </VirtualHost>
 

--
Gitblit v1.9.1