From 22de27327c030a8f494348c52bef3f6a4f85b0fc Mon Sep 17 00:00:00 2001
From: Ben Roberts <ben@thatmustbe.me>
Date: Sat, 18 Jun 2016 08:16:09 -0400
Subject: [PATCH] recreate fix for #2617 on correct branch

---
 .htaccess      |  9 ++++++++-
 util/.htaccess | 11 +++++++++--
 view/.htaccess | 11 +++++++++--
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/.htaccess b/.htaccess
index 1b63f9ad6f..2348cdc38b 100644
--- a/.htaccess
+++ b/.htaccess
@@ -4,7 +4,14 @@ AddType audio/ogg .oga
 #AddHandler php53-cgi .php
 
 <FilesMatch "\.(out|log)$">
-Deny from all
+  <IfModule authz_host_module> 
+    #Apache 2.4
+    Require all denied
+  </IfModule>
+  <IfModule !authz_host_module>
+    #Apache 2.2
+    Deny from all
+  </IfModule>
 </FilesMatch>
 
 <IfModule mod_rewrite.c>
diff --git a/util/.htaccess b/util/.htaccess
index b311c14c23..7b1f94f0e6 100644
--- a/util/.htaccess
+++ b/util/.htaccess
@@ -1,5 +1,12 @@
 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 authz_host_module> 
+  #Apache 2.4
+  Require all denied
+</IfModule>
+<IfModule !authz_host_module>
+  #Apache 2.2
+  Deny from all
+</IfModule>
 
diff --git a/view/.htaccess b/view/.htaccess
index 559a5fcc09..04cd546856 100644
--- a/view/.htaccess
+++ b/view/.htaccess
@@ -1,3 +1,10 @@
 <FilesMatch "\.tpl">
-Deny from all
-</FilesMatch>
\ No newline at end of file
+  <IfModule authz_host_module> 
+    #Apache 2.4
+    Require all denied
+  </IfModule>
+  <IfModule !authz_host_module>
+    #Apache 2.2
+    Deny from all
+  </IfModule>
+</FilesMatch>