From 8ddcb0d7ac2141b934c789cd7b5cf06f05e730b0 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 18 Feb 2014 09:27:43 -0500
Subject: [PATCH] Merge remote-tracking branch 'origin/stable-3.0.5'
---
install/tpl/apache_apps.vhost.master | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/install/tpl/apache_apps.vhost.master b/install/tpl/apache_apps.vhost.master
index cfedb9e..d132b50 100644
--- a/install/tpl/apache_apps.vhost.master
+++ b/install/tpl/apache_apps.vhost.master
@@ -20,7 +20,7 @@
AddType application/x-httpd-php .php
<Directory {apps_vhost_dir}>
# php_admin_value open_basedir "{apps_vhost_dir}:/usr/share:/tmp"
- Options FollowSymLinks
+ Options +FollowSymLinks
AllowOverride None
Order allow,deny
Allow from all
@@ -31,7 +31,7 @@
DocumentRoot {apps_vhost_dir}
SuexecUserGroup ispapps ispapps
<Directory {apps_vhost_dir}>
- Options Indexes FollowSymLinks MultiViews +ExecCGI
+ Options +Indexes +FollowSymLinks +MultiViews +ExecCGI
AllowOverride AuthConfig Indexes Limit Options FileInfo
AddHandler fcgid-script .php
FCGIWrapper {website_basedir}/php-fcgi-scripts/apps/.php-fcgi-starter .php
--
Gitblit v1.9.1