[websvn] Add support for httpd 2.4

Xavier Bachelot xavierb at fedoraproject.org
Sun Dec 2 14:47:36 UTC 2012


commit 2e456faa279ec1f8bcf964493ca0333863f9df90
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Sun Dec 2 15:38:45 2012 +0100

    Add support for httpd 2.4

 websvn-httpd.conf |   13 ++++++++++---
 websvn.spec       |    5 ++++-
 2 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/websvn-httpd.conf b/websvn-httpd.conf
index ac38519..006ac8a 100644
--- a/websvn-httpd.conf
+++ b/websvn-httpd.conf
@@ -3,7 +3,14 @@ Alias /websvn /usr/share/websvn/
 <Directory /usr/share/websvn/>
    Options MultiViews
    DirectoryIndex wsvn.php
-   order deny,allow
-   deny from all
-   allow from 127.0.0.1
+   <IfModule mod_authz_core.c>
+      # Apache 2.4
+      Require local
+   </IfModule>
+   <IfModule !mod_authz_core.c>
+      # Apache 2.2
+      order deny,allow
+      deny from all
+      allow from 127.0.0.1 ::1
+   </IfModule>
 </Directory>
diff --git a/websvn.spec b/websvn.spec
index a4cb877..357d3db 100644
--- a/websvn.spec
+++ b/websvn.spec
@@ -1,6 +1,6 @@
 Name:           websvn
 Version:        2.3.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Online subversion repository browser
 
 Group:          Applications/System
@@ -122,6 +122,9 @@ fi
 
 
 %changelog
+* Sun Dec 02 2012 Johan Cwiklinski <johan AT x-tnd DOT be> - 2.3.3-4
+- Fix apache 2.4 configuration (bz #871495)
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list