From bfcdef6bc91753cb2044e3626f522b5b1aec129f Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 14 Nov 2012 05:34:56 -0500
Subject: [PATCH] Merged revisions 3596-3670 from 3.0.5 stable branch.
---
install/tpl/apache_ispconfig.vhost.master | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master
index bca61b2..4d59dfe 100644
--- a/install/tpl/apache_ispconfig.vhost.master
+++ b/install/tpl/apache_ispconfig.vhost.master
@@ -10,6 +10,10 @@
<VirtualHost _default_:{vhost_port}>
ServerAdmin webmaster@localhost
+ <FilesMatch "\.ph(p3?|tml)$">
+ SetHandler None
+ </FilesMatch>
+
<IfModule mod_fcgid.c>
DocumentRoot /var/www/ispconfig/
SuexecUserGroup ispconfig ispconfig
@@ -23,18 +27,18 @@
</Directory>
</IfModule>
- <IfModule mod_php5.c>
- DocumentRoot /usr/local/ispconfig/interface/web/
- AddType application/x-httpd-php .php
- <Directory /usr/local/ispconfig/interface/web>
- # php_admin_value open_basedir "/usr/local/ispconfig/interface:/usr/share:/tmp"
- Options FollowSymLinks
- AllowOverride None
- Order allow,deny
- Allow from all
- php_value magic_quotes_gpc 0
- </Directory>
- </IfModule>
+# <IfModule mod_php5.c>
+# DocumentRoot /usr/local/ispconfig/interface/web/
+# AddType application/x-httpd-php .php
+# <Directory /usr/local/ispconfig/interface/web>
+# # php_admin_value open_basedir "/usr/local/ispconfig/interface:/usr/share:/tmp"
+# Options FollowSymLinks
+# AllowOverride None
+# Order allow,deny
+# Allow from all
+# php_value magic_quotes_gpc 0
+# </Directory>
+# </IfModule>
# ErrorLog /var/log/apache2/error.log
# CustomLog /var/log/apache2/access.log combined
--
Gitblit v1.9.1