From: Stefan Fritsch <sf@apache.org>
Date: Mon, 6 Jun 2011 21:40:41 +0000 (+0000)
Subject: Use Require method instead of deprecated Limit/LimitExcept
X-Git-Tag: 2.3.13~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a739d71433dc72861e479b7f222256740fc95df6;p=thirdparty%2Fapache%2Fhttpd.git

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
---

diff --git a/docs/conf/extra/httpd-dav.conf.in b/docs/conf/extra/httpd-dav.conf.in
index da8bfefe1db..b196ed029df 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 2a030fd051b..a744322c19a 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>