Merge pull request #2620 from dissolve/2617

recreate fix for #2617 on correct branch

diff --git a/.htaccess b/.htaccess
index 1b63f9ad6fb2b81060f5da54cdc82277ceb7f310..2348cdc38b36ca4eed776ae762eee7d2c8edf660 100644 (file)
--- 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 b311c14c23a638a6d4c13c5c396d72ad88e4687f..7b1f94f0e654d6ff308d439d8dec5f934b8f82f6 100644 (file)
--- 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 559a5fcc09638da18364d85f11f2723b81b28488..04cd5468569ab649f5420390a4eb9fba2ddd8da7 100644 (file)
--- 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>