From dcbe69a6200e0fffe48a185c590e361ce8f6d3fc Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 6 Oct 2014 15:09:04 +0000
Subject: [PATCH] * Apache 2.4 and RHEL 7 installation fixes

---
 doc/rpm-build/apache.conf | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/doc/rpm-build/apache.conf b/doc/rpm-build/apache.conf
index e576e9ddbb..b9950e5781 100644
--- a/doc/rpm-build/apache.conf
+++ b/doc/rpm-build/apache.conf
@@ -15,9 +15,17 @@ RedirectMatch ^(/principals/users/.*)$ /egroupware/groupdav.php$1
 
 <Directory /usr/share/egroupware/>
   Options FollowSymLinks ExecCGI
-  AllowOverride None
-  Order allow,deny
-  Allow from all
+  <IfModule mod_authz_core.c>
+    # Apache 2.4
+    AllowOverride None
+    Require all granted
+  </IfModule>
+  <IfModule !mod_authz_core.c>
+    # Apache 2.2
+    AllowOverride None
+    Order allow,deny
+    Allow from all
+  </IfModule>
   DirectoryIndex index.html index.php
   AddHandler cgi-script .cgi
   AddDefaultCharset Off
@@ -41,8 +49,15 @@ RedirectMatch ^(/principals/users/.*)$ /egroupware/groupdav.php$1
   php_value post_max_size 65M
   php_value max_input_vars 3000
   <Files ~ "\.inc\.php$">
-    Order allow,deny
-    Deny from all
+    <IfModule mod_authz_core.c>
+     # Apache 2.4
+     Require all denied
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+     # Apache 2.2
+     Order allow,deny
+     Deny from all
+    </IfModule>
   </Files>
   # Enable the following block in order to redirect logins to HTTPS:
   #RewriteEngine On