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' --- install/tpl/apache_apps.vhost.master | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/install/tpl/apache_apps.vhost.master b/install/tpl/apache_apps.vhost.master index 068158c..cfedb9e 100644 --- a/install/tpl/apache_apps.vhost.master +++ b/install/tpl/apache_apps.vhost.master @@ -11,6 +11,10 @@ ServerAdmin webmaster@localhost {apps_vhost_servername} + <FilesMatch "\.ph(p3?|tml)$"> + SetHandler None + </FilesMatch> + <IfModule mod_php5.c> DocumentRoot {apps_vhost_dir} AddType application/x-httpd-php .php @@ -31,12 +35,11 @@ AllowOverride AuthConfig Indexes Limit Options FileInfo AddHandler fcgid-script .php FCGIWrapper {website_basedir}/php-fcgi-scripts/apps/.php-fcgi-starter .php + # FcgidBusyTimeout 3600 Order allow,deny Allow from all </Directory> </IfModule> - - ServerSignature Off </VirtualHost> -- Gitblit v1.9.1