From 26ff848639089658d49013e3a5beea35a95f30ee Mon Sep 17 00:00:00 2001
From: Klaus <Klaus.Weidenbach@gmx.net>
Date: Mon, 22 Jun 2015 00:33:53 +0200
Subject: Revert "Compatible update for .htaccess."

---
 .htaccess      | 10 +++-------
 util/.htaccess | 11 +++--------
 view/.htaccess | 10 ++--------
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/.htaccess b/.htaccess
index e9c4de14d..39fd89e04 100644
--- a/.htaccess
+++ b/.htaccess
@@ -5,13 +5,7 @@ AddType audio/ogg .oga
 
 # don't allow any web access to logfiles, even after rotation/compression
 <FilesMatch "\.(out|log|gz)$">
-  <IfModule !mod_access_compat.c>
-    Require all denied
-  </IfModule>
-  <IfModule mod_access_compat.c>
-    Order deny,allow
-    Deny from all
-  </IfModule>
+Deny from all
 </FilesMatch>
 
 <IfModule mod_rewrite.c>
@@ -28,4 +22,6 @@ AddType audio/ogg .oga
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
   RewriteRule ^(.*)$ index.php?q=$1 [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
+
 </IfModule>
+
diff --git a/util/.htaccess b/util/.htaccess
index 333a08d40..b311c14c2 100644
--- a/util/.htaccess
+++ b/util/.htaccess
@@ -1,10 +1,5 @@
 Options -Indexes
 
-# Remove the following lines or modify it to run the string translator utility
-<IfModule !mod_access_compat.c>
-  Require all denied
-</IfModule>
-<IfModule mod_access_compat.c>
-  Order deny,allow
-  Deny from all
-</IfModule>
+# Remove the following line or modify it to run the string translator utility
+Deny from all
+
diff --git a/view/.htaccess b/view/.htaccess
index 115be49c0..559a5fcc0 100644
--- a/view/.htaccess
+++ b/view/.htaccess
@@ -1,9 +1,3 @@
 <FilesMatch "\.tpl">
-  <IfModule !mod_access_compat.c>
-    Require all denied
-  </IfModule>
-  <IfModule mod_access_compat.c>
-    Order deny,allow
-    Deny from all
-  </IfModule>
-</FilesMatch>
+Deny from all
+</FilesMatch>
\ No newline at end of file
-- 
cgit v1.2.3


From c3fa0a3ca73cf0935de143bd4a1cbd11ea74acb3 Mon Sep 17 00:00:00 2001
From: Klaus Weidenbach <Klaus.Weidenbach@gmx.net>
Date: Sun, 21 Jun 2015 23:58:19 +0200
Subject: Compatible update for .htaccess.

This should hopefully work in Apache 2.2 and 2.4.
---
 .htaccess      | 11 +++++++----
 util/.htaccess | 11 ++++++++---
 view/.htaccess | 10 ++++++++--
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/.htaccess b/.htaccess
index 39fd89e04..7f3935117 100644
--- a/.htaccess
+++ b/.htaccess
@@ -5,7 +5,13 @@ AddType audio/ogg .oga
 
 # don't allow any web access to logfiles, even after rotation/compression
 <FilesMatch "\.(out|log|gz)$">
-Deny from all
+  <IfModule mod_authz_core.c>
+    Require all denied
+  </IfModule>
+  <IfModule !mod_authz_core.c>
+    Order deny,allow
+    Deny from all
+  </IfModule>
 </FilesMatch>
 
 <IfModule mod_rewrite.c>
@@ -14,7 +20,6 @@ Deny from all
   RewriteRule "(^|/)\.git" - [F]
   RewriteRule "(^|/)store" - [F]
 
-
   # Rewrite current-style URLs of the form 'index.php?q=x'.
   # Also place auth information into REMOTE_USER for sites running
   # in CGI mode.
@@ -22,6 +27,4 @@ Deny from all
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
   RewriteRule ^(.*)$ index.php?q=$1 [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
-
 </IfModule>
-
diff --git a/util/.htaccess b/util/.htaccess
index b311c14c2..a0a0d72d9 100644
--- a/util/.htaccess
+++ b/util/.htaccess
@@ -1,5 +1,10 @@
 Options -Indexes
 
-# Remove the following line or modify it to run the string translator utility
-Deny from all
-
+# Remove the following lines or modify it to run the string translator utility
+<IfModule mod_authz_core.c>
+  Require all denied
+</IfModule>
+<IfModule !mod_authz_core.c>
+  Order deny,allow
+  Deny from all
+</IfModule>
diff --git a/view/.htaccess b/view/.htaccess
index 559a5fcc0..7aa6c4506 100644
--- a/view/.htaccess
+++ b/view/.htaccess
@@ -1,3 +1,9 @@
 <FilesMatch "\.tpl">
-Deny from all
-</FilesMatch>
\ No newline at end of file
+  <IfModule mod_authz_core.c>
+    Require all denied
+  </IfModule>
+  <IfModule !mod_authz_core.c>
+    Order deny,allow
+    Deny from all
+  </IfModule>
+</FilesMatch>
-- 
cgit v1.2.3