From: Ken Coar <coar@apache.org>
Date: Fri, 6 Jul 2001 19:55:24 +0000 (+0000)
Subject: 	Make sure that we *really* deny access to .ht* files..
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fea015233d00e45f95dc7c0264b9db1dee513ecc;p=thirdparty%2Fapache%2Fhttpd.git

	Make sure that we *really* deny access to .ht* files..


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@89509 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/conf/httpd.conf-dist b/conf/httpd.conf-dist
index ccf3edd8335..6450e124a19 100644
--- a/conf/httpd.conf-dist
+++ b/conf/httpd.conf-dist
@@ -379,6 +379,7 @@ AccessFileName .htaccess
 <Files ~ "^\.ht">
     Order allow,deny
     Deny from all
+    Satisfy All
 </Files>
 
 #
diff --git a/conf/httpd.conf-dist-nw b/conf/httpd.conf-dist-nw
index c24994710ee..99689c0e542 100644
--- a/conf/httpd.conf-dist-nw
+++ b/conf/httpd.conf-dist-nw
@@ -337,6 +337,7 @@ AccessFileName .htaccess
 <Files ~ "^\.ht">
     Order allow,deny
     Deny from all
+    Satisfy All
 </Files>
 
 #
diff --git a/conf/httpd.conf-dist-win b/conf/httpd.conf-dist-win
index 436fd610ec5..40fa7819703 100644
--- a/conf/httpd.conf-dist-win
+++ b/conf/httpd.conf-dist-win
@@ -367,6 +367,7 @@ AccessFileName .htaccess
 <Files ~ "^\.ht">
     Order allow,deny
     Deny from all
+    Satisfy All
 </Files>
 
 #
diff --git a/src/CHANGES b/src/CHANGES
index 612686ee304..a9769cfc4f9 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,10 @@
 Changes with Apache 1.3.21
 
+  *) Fix the <Files ~ "^\.ht"> container to *really* deny all access.
+     Without the Satisfy All, .ht* files could still be fetched if
+     they were within the scope of a Satisfy Any directive.
+     [Ken Coar]
+
   *) Print a warning when an attempt is made to use line-end comments.
      Apparently they are not detected/handled gracefully by all directives.
      [Martin Kraemer]