summaryrefslogtreecommitdiff
path: root/docs/conf
diff options
context:
space:
mode:
authorStefan Fritsch <sf@apache.org>2011-06-06 21:40:41 +0000
committerStefan Fritsch <sf@apache.org>2011-06-06 21:40:41 +0000
commita739d71433dc72861e479b7f222256740fc95df6 (patch)
tree46f15d01d755137958df96bd6794f6aa43f9b3ff /docs/conf
parentc9fd2623da21dc757571e93f8c14344946e59ec7 (diff)
downloadhttpd-a739d71433dc72861e479b7f222256740fc95df6.tar.gz
Use Require method instead of deprecated Limit/LimitExcept
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1132790 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs/conf')
-rw-r--r--docs/conf/extra/httpd-dav.conf.in7
-rw-r--r--docs/conf/extra/httpd-userdir.conf.in7
2 files changed, 5 insertions, 9 deletions
diff --git a/docs/conf/extra/httpd-dav.conf.in b/docs/conf/extra/httpd-dav.conf.in
index da8bfefe1d..b196ed029d 100644
--- a/docs/conf/extra/httpd-dav.conf.in
+++ b/docs/conf/extra/httpd-dav.conf.in
@@ -28,9 +28,10 @@ Alias /uploads "@@ServerRoot@@/uploads"
# Allow universal read-access, but writes are restricted
# to the admin user.
- <LimitExcept GET POST OPTIONS>
- require user admin
- </LimitExcept>
+ <RequireAny>
+ Require method GET POST OPTIONS
+ Require user admin
+ </RequireAny>
</Directory>
#
diff --git a/docs/conf/extra/httpd-userdir.conf.in b/docs/conf/extra/httpd-userdir.conf.in
index 2a030fd051..a744322c19 100644
--- a/docs/conf/extra/httpd-userdir.conf.in
+++ b/docs/conf/extra/httpd-userdir.conf.in
@@ -16,11 +16,6 @@ UserDir public_html
<Directory "/home/*/public_html">
AllowOverride FileInfo AuthConfig Limit Indexes
Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
- <Limit GET POST OPTIONS>
- Require all granted
- </Limit>
- <LimitExcept GET POST OPTIONS>
- Require all denied
- </LimitExcept>
+ Require method GET POST OPTIONS
</Directory>