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 ccf3edd8335aa072fabe67b86396aeb5e8aeb7c3..6450e124a195213d8ca8bc81c91e6f92fd57c4de 100644 (file)
--- 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 c24994710ee6fb7a38eb96d1c217623d86ae22e9..99689c0e5422cd2235358a6c71c64e14e703e37a 100644 (file)
--- 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 436fd610ec5e9330297e0bcc79c5ed90058ce9d7..40fa781970367e9f8fc9033fd572d0a5f7c7a33a 100644 (file)
--- 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 612686ee3044d268bac6b567d89f7d61bc5651b8..a9769cfc4f9dadd79598ccde09455fd5279fac4c 100644 (file)
--- 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]