From 3317cf1c292d5886bcdc2f6c2d8ebbe37f90de96 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 7 Oct 2014 12:56:04 +0000
Subject: [PATCH] changing access control stuff for Apache 2.4 again, as
 openSUSE 13.1 base config uses Deny, which has higher precedence then Require

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

diff --git a/doc/rpm-build/apache.conf b/doc/rpm-build/apache.conf
index b9950e5781..70a2a3c2d4 100644
--- a/doc/rpm-build/apache.conf
+++ b/doc/rpm-build/apache.conf
@@ -15,17 +15,13 @@ 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
@@ -49,15 +45,12 @@ 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