From a3f9f75c2624b73c4a57bf2a346ae71bf6a5fb98 Mon Sep 17 00:00:00 2001
From: Marc Schiffbauer <marc@schiffbauer.net>
Date: Tue, 29 Mar 2011 23:48:47 +0200
Subject: [PATCH] Make .htaccess access protection work in more setups

Before this patch with a .htaccess file on a higher level in the
hierarchy with "Satisfy Any" it has been possible that the directory
protection didn't work as expected.
---
 conf/.htaccess     | 7 ++++---
 data/.htaccess     | 1 +
 inc/.htaccess      | 7 ++++---
 inc/lang/.htaccess | 7 ++++---
 lib/_fla/.htaccess | 1 +
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/conf/.htaccess b/conf/.htaccess
index 763ebf2ee..f5dda6086 100644
--- a/conf/.htaccess
+++ b/conf/.htaccess
@@ -1,3 +1,4 @@
-## no access to the conf directory
-order allow,deny
-deny from all
+## no access to the conf directory
+order allow,deny
+deny from all
+Satisfy All
diff --git a/data/.htaccess b/data/.htaccess
index 281d5c33d..2cbb757e7 100644
--- a/data/.htaccess
+++ b/data/.htaccess
@@ -1,2 +1,3 @@
 order allow,deny
 deny from all
+Satisfy All
diff --git a/inc/.htaccess b/inc/.htaccess
index aebb21cd2..68ae43e72 100644
--- a/inc/.htaccess
+++ b/inc/.htaccess
@@ -1,3 +1,4 @@
-## no access to the inc directory
-order allow,deny
-deny from all
+## no access to the inc directory
+order allow,deny
+deny from all
+Satisfy All
diff --git a/inc/lang/.htaccess b/inc/lang/.htaccess
index 2ca129b12..572f5156f 100644
--- a/inc/lang/.htaccess
+++ b/inc/lang/.htaccess
@@ -1,3 +1,4 @@
-## no access to the lang directory
-order allow,deny
-deny from all
+## no access to the lang directory
+order allow,deny
+deny from all
+Satisfy All
diff --git a/lib/_fla/.htaccess b/lib/_fla/.htaccess
index 9a7d38c12..055d099c7 100644
--- a/lib/_fla/.htaccess
+++ b/lib/_fla/.htaccess
@@ -1,3 +1,4 @@
 ## no access to the fla directory
 order allow,deny
 deny from all
+Satisfy All
-- 
GitLab