From: Rich Bowen <rbowen@apache.org>
Date: Fri, 16 Oct 2009 13:55:17 +0000 (+0000)
Subject: Adds the frequently-requested example of relaxing authentication for a
X-Git-Tag: 2.3.3~167
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3d47d2cc415da1671d7cb8e3502f3ed645914de6;p=thirdparty%2Fapache%2Fhttpd.git

Adds the frequently-requested example of relaxing authentication for a
subdirectory. Whether this is actually a *good* idea is left as an
exercise for the reader.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@825898 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/mod/mod_access_compat.html.en b/docs/manual/mod/mod_access_compat.html.en
index a04c297f6bb..a91adab23fa 100644
--- a/docs/manual/mod/mod_access_compat.html.en
+++ b/docs/manual/mod/mod_access_compat.html.en
@@ -414,6 +414,26 @@ later</td></tr>
       Satisfy Any
     </code></p></div>
 
+    <p>
+    Another frequent use of the <code class="directive">Satisfy</code> directive
+    is to relax access restrictions for a subdirectory:
+    </p>
+
+    <div class="example"><p><code>
+      &lt;Directory /var/www/private&gt;<br />
+        Require valid-user<br /> 
+      &lt;/Directory&gt;<br />
+      <br />
+      &lt;Directory /var/www/private/public&gt;<br />
+        Allow from all<br />
+        Satisfy Any<br />
+      &lt;/Directory&gt;
+    </code></p></div>
+
+    <p>In the above example, authentication will be required for the
+    <code>/var/www/private</code> directory, but will not be required
+    for the <code>/var/www/private/public</code> directory.</p>
+
     <p>Since version 2.0.51 <code class="directive">Satisfy</code> directives can
     be restricted to particular methods by <code class="directive"><a href="../mod/core.html#limit">&lt;Limit&gt;</a></code> and <code class="directive"><a href="../mod/core.html#limitexcept">&lt;LimitExcept&gt;</a></code> sections.</p>
 
diff --git a/docs/manual/mod/mod_access_compat.xml b/docs/manual/mod/mod_access_compat.xml
index 4b9fca2e695..7ce830cec06 100644
--- a/docs/manual/mod/mod_access_compat.xml
+++ b/docs/manual/mod/mod_access_compat.xml
@@ -433,6 +433,26 @@ later</compatibility>
       Satisfy Any
     </example>
 
+    <p>
+    Another frequent use of the <directive>Satisfy</directive> directive
+    is to relax access restrictions for a subdirectory:
+    </p>
+
+    <example>
+      &lt;Directory /var/www/private&gt;<br />
+        Require valid-user<br /> 
+      &lt;/Directory&gt;<br />
+      <br />
+      &lt;Directory /var/www/private/public&gt;<br />
+        Allow from all<br />
+        Satisfy Any<br />
+      &lt;/Directory&gt;
+    </example>
+
+    <p>In the above example, authentication will be required for the
+    <code>/var/www/private</code> directory, but will not be required
+    for the <code>/var/www/private/public</code> directory.</p>
+
     <p>Since version 2.0.51 <directive>Satisfy</directive> directives can
     be restricted to particular methods by <directive module="core"
     type="section">Limit</directive> and <directive module="core" type="section"