From 8c8e7d24a76d82cf37b19d02983e140fff177540 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Mon, 8 Sep 2014 15:25:21 -0400
Subject: [PATCH] Modified Apache's config file to handle Apache > 2.3

---
 Apache/SOGo-apple-ab.conf |  9 +++++++--
 Apache/SOGo.conf          | 10 ++++++++--
 NEWS                      |  1 +
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/Apache/SOGo-apple-ab.conf b/Apache/SOGo-apple-ab.conf
index 9c42bf1cd..936fb98cc 100644
--- a/Apache/SOGo-apple-ab.conf
+++ b/Apache/SOGo-apple-ab.conf
@@ -28,8 +28,13 @@
   ProxyPass /SOGo http://127.0.0.1:20000/SOGo interpolate
   ProxyPass / http://127.0.0.1:20000/SOGo/dav/ interpolate
   <Location />
-    Order allow,deny
-    Allow from all
+    <IfVersion < 2.4>      
+      Order deny,allow
+      Allow from all
+    </IfVersion>
+    <IfVersion >= 2.4>
+      Require all granted
+    </IfVersion>
   </Location>
 
   <Proxy http://127.0.0.1:20000>
diff --git a/Apache/SOGo.conf b/Apache/SOGo.conf
index f36fbbe8f..bfe7560ba 100644
--- a/Apache/SOGo.conf
+++ b/Apache/SOGo.conf
@@ -5,8 +5,14 @@ Alias /SOGo/WebServerResources/ \
 
 <Directory /usr/lib/GNUstep/SOGo/>
     AllowOverride None
-    Order deny,allow
-    Allow from all
+
+    <IfVersion < 2.4>      
+        Order deny,allow
+        Allow from all
+    </IfVersion>
+    <IfVersion >= 2.4>
+        Require all granted
+    </IfVersion>
 
     # Explicitly allow caching of static content to avoid browser specific behavior.
     # A resource's URL MUST change in order to have the client load the new version.
diff --git a/NEWS b/NEWS
index 46eb20152..80bd1a16c 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,7 @@ Bug fixes
  - fixed Events and tasks cannot be moved to other calendars using drag&drop (#2759)
  - fixed In "Multicolumn Day View" mouse position is not honored when creating an event (#2864)
  - fixed handling of messages labels (#2902)
+ - fixed Apache > 2.3 configuration
 
 2.2.7 (2014-07-30)
 ------------------