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/apache_apps.vhost.master | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/server/conf/apache_apps.vhost.master b/server/conf/apache_apps.vhost.master
index 299ad44..ff6d4da 100644
--- a/server/conf/apache_apps.vhost.master
+++ b/server/conf/apache_apps.vhost.master
@@ -11,18 +11,9 @@
ServerAdmin webmaster@localhost
{apps_vhost_servername}
- <IfModule mod_fcgid.c>
- DocumentRoot {apps_vhost_dir}
- SuexecUserGroup ispapps ispapps
- <Directory {apps_vhost_dir}>
- Options Indexes FollowSymLinks MultiViews +ExecCGI
- AllowOverride AuthConfig Indexes Limit Options FileInfo
- AddHandler fcgid-script .php
- FCGIWrapper {apps_vhost_basedir}/php-fcgi-scripts/apps/.php-fcgi-starter .php
- Order allow,deny
- Allow from all
- </Directory>
- </IfModule>
+ <FilesMatch "\.ph(p3?|tml)$">
+ SetHandler None
+ </FilesMatch>
<IfModule mod_php5.c>
DocumentRoot {apps_vhost_dir}
@@ -35,7 +26,18 @@
</Directory>
</IfModule>
- ServerSignature Off
+ <IfModule mod_fcgid.c>
+ DocumentRoot {apps_vhost_dir}
+ SuexecUserGroup ispapps ispapps
+ <Directory {apps_vhost_dir}>
+ Options Indexes FollowSymLinks MultiViews +ExecCGI
+ AllowOverride AuthConfig Indexes Limit Options FileInfo
+ AddHandler fcgid-script .php
+ FCGIWrapper {apps_vhost_basedir}/php-fcgi-scripts/apps/.php-fcgi-starter .php
+ Order allow,deny
+ Allow from all
+ </Directory>
+ </IfModule>
</VirtualHost>
--
Gitblit v1.9.1