From 268b188133d6f5c58291b5a272be4c0df166b3a7 Mon Sep 17 00:00:00 2001
From: Johannes Feichtner <johannes.feichtner@iaik.tugraz.at>
Date: Tue, 15 Sep 2015 23:17:43 +0200
Subject: [PATCH] Apache 2.4: Add AllowOVerride All, otherwise Apache ignores
 .htaccess files

---
 scripts/jobs/cron_tasks.inc.http.10.apache.php       | 4 ++++
 scripts/jobs/cron_tasks.inc.http.15.apache_fcgid.php | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/scripts/jobs/cron_tasks.inc.http.10.apache.php b/scripts/jobs/cron_tasks.inc.http.10.apache.php
index 91eac345..808620f8 100644
--- a/scripts/jobs/cron_tasks.inc.http.10.apache.php
+++ b/scripts/jobs/cron_tasks.inc.http.10.apache.php
@@ -84,6 +84,7 @@ class apache extends HttpConfigBase {
 			// >=apache-2.4 enabled?
 			if (Settings::Get('system.apache24') == '1') {
 				$this->virtualhosts_data[$vhosts_filename].= '    Require all granted' . "\n";
+				$this->virtualhosts_data[$vhosts_filename].= '    AllowOverride All' . "\n";
 			} else {
 				$this->virtualhosts_data[$vhosts_filename].= '    Order allow,deny' . "\n";
 				$this->virtualhosts_data[$vhosts_filename].= '    allow from all' . "\n";
@@ -230,6 +231,7 @@ class apache extends HttpConfigBase {
 							// for this path, as this would be the first require and therefore grant all access
 							if ($mypath_dir->isUserProtected() == false) {
 								$this->virtualhosts_data[$vhosts_filename].= '    Require all granted' . "\n";
+								$this->virtualhosts_data[$vhosts_filename].= '    AllowOverride All' . "\n";
 							}
 						} else {
 							$this->virtualhosts_data[$vhosts_filename].= '    Order allow,deny' . "\n";
@@ -284,6 +286,7 @@ class apache extends HttpConfigBase {
 							// for this path, as this would be the first require and therefore grant all access
 							if ($mypath_dir->isUserProtected() == false) {
 								$this->virtualhosts_data[$vhosts_filename] .= '    Require all granted' . "\n";
+								$this->virtualhosts_data[$vhosts_filename] .= '    AllowOverride All' . "\n";
 							}
 						} else {
 							$this->virtualhosts_data[$vhosts_filename] .= '    Order allow,deny' . "\n";
@@ -1049,6 +1052,7 @@ class apache extends HttpConfigBase {
 						// for this path, as this would be the first require and therefore grant all access
 						if ($mypath_dir->isUserProtected() == false) {
 							$this->diroptions_data[$diroptions_filename] .= '  Require all granted' . "\n";
+							//$this->diroptions_data[$diroptions_filename] .= '  AllowOverride All' . "\n";
 						}
 					} else {
 						$this->diroptions_data[$diroptions_filename] .= '  Order allow,deny' . "\n";
diff --git a/scripts/jobs/cron_tasks.inc.http.15.apache_fcgid.php b/scripts/jobs/cron_tasks.inc.http.15.apache_fcgid.php
index 108fe525..6e569d8f 100644
--- a/scripts/jobs/cron_tasks.inc.http.15.apache_fcgid.php
+++ b/scripts/jobs/cron_tasks.inc.http.15.apache_fcgid.php
@@ -55,6 +55,7 @@ class apache_fcgid extends apache
 				    if ($mypath_dir->isUserProtected() == false) {
 						$php_options_text.= '  <Directory "' . makeCorrectDir($domain['documentroot']) . '">' . "\n";
 					    $php_options_text.= '    Require all granted' . "\n";
+						$php_options_text.= '    AllowOverride All' . "\n";
 						$php_options_text.= '  </Directory>' . "\n";
 				    }
 
@@ -73,6 +74,7 @@ class apache_fcgid extends apache
 					    // for this path, as this would be the first require and therefore grant all access
 					    if ($mypath_dir->isUserProtected() == false) {
 						    $php_options_text.= '    Require all granted' . "\n";
+							$php_options_text.= '    AllowOverride All' . "\n";
 					    }
 					} else {
 						$php_options_text.= '    Order allow,deny' . "\n";
@@ -110,6 +112,7 @@ class apache_fcgid extends apache
 					    // for this path, as this would be the first require and therefore grant all access
 					    if ($mypath_dir->isUserProtected() == false) {
 						    $php_options_text.= '    Require all granted' . "\n";
+							$php_options_text.= '    AllowOverride All' . "\n";
 					    }
 					} else {
 						$php_options_text.= '    Order allow,deny' . "\n";