summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Fritsch <sf@debian.org>2010-03-10 20:07:55 +0000
committerStefan Fritsch <sf@sfritsch.de>2012-01-02 10:37:08 +0100
commit9a7db02c58e5489b7791192630fc52bc6588233a (patch)
treec048c83420fa1d4bd33ab5654aac65c19f3a1504
parentb41567f5bcd5becd498669813e46ff9b45169896 (diff)
downloadapache2-9a7db02c58e5489b7791192630fc52bc6588233a.tar.gz
add Satisfy all to Files ~ "^\.ht" block
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@1167 01b336ce-410b-0410-9a02-a0e7f243c266
-rw-r--r--debian/changelog6
-rw-r--r--debian/config-dir/apache2.conf1
2 files changed, 5 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 364965dc..0e5a6a59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
-apache2 (2.2.15-2) UNRELEASED; urgency=low
+apache2 (2.2.15-3) UNRELEASED; urgency=low
+ * Make the Files ~ "^\.ht" block in apache2.conf more secure by adding
+ Satisfy all. Closes: #572075
* mod_reqtimeout: Various bug fixes, including:
- Don't mess up timeouts of mod_proxy's backend connections.
Closes: #573163
- -- Stefan Fritsch <sf@debian.org> Wed, 10 Mar 2010 20:51:34 +0100
+ -- Stefan Fritsch <sf@debian.org> Wed, 10 Mar 2010 21:06:06 +0100
apache2 (2.2.15-1) unstable; urgency=low
diff --git a/debian/config-dir/apache2.conf b/debian/config-dir/apache2.conf
index 9e98d619..9ef7e58a 100644
--- a/debian/config-dir/apache2.conf
+++ b/debian/config-dir/apache2.conf
@@ -159,6 +159,7 @@ AccessFileName .htaccess
<Files ~ "^\.ht">
Order allow,deny
Deny from all
+ Satisfy all
</Files>
#