httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sl...@apache.org
Subject svn commit: r167971 - /httpd/httpd/branches/2.0.x/docs/manual/howto/htaccess.html.en /httpd/httpd/branches/2.0.x/docs/manual/howto/htaccess.xml
Date Tue, 03 May 2005 19:54:49 GMT
Author: slive
Date: Tue May  3 12:54:47 2005
New Revision: 167971

URL: http://svn.apache.org/viewcvs?rev=167971&view=rev
Log:
Backport:
Add a little detail about merging of .htaccess with httpd.conf,
and provide an example to enforce certain settings.

PR: 31782
Submitted by: Ray Ferguson <ferguson berbee.com>, Joshua Slive

Modified:
    httpd/httpd/branches/2.0.x/docs/manual/howto/htaccess.html.en
    httpd/httpd/branches/2.0.x/docs/manual/howto/htaccess.xml

Modified: httpd/httpd/branches/2.0.x/docs/manual/howto/htaccess.html.en
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/howto/htaccess.html.en?rev=167971&r1=167970&r2=167971&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/howto/htaccess.html.en (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/howto/htaccess.html.en Tue May  3 12:54:47 2005
@@ -238,6 +238,34 @@
     permitted, as only <code>Options Includes</code> is in effect, which
     completely overrides any earlier setting that may have been in
     place.</p>
+
+    <h3><a name="merge" id="merge">Merging of .htaccess with the main
+    configuration files</a></h3>
+
+    <p>As discussed in the documentation on <a href="../sections.html">Configuration
Sections</a>,
+    <code>.htaccess</code> files can override the <code class="directive"><a
href="../mod/core.html#directory">&lt;Directory&gt;</a></code> sections
for
+    the corresponding directory, but will be overriden by other types
+    of configuration sections from the main configuration files.  This
+    fact can be used to enforce certain configurations, even in the
+    presence of a liberal <code class="directive"><a href="../mod/core.html#allowoverride">AllowOverride</a></code>
setting.  For example, to
+    prevent script execution while allowing anything else to be set in
+    <code>.htaccess</code> you can use:</p>
+
+    <div class="example"><p><code>
+&lt;Directory /&gt;<br />
+<span class="indent">
+Allowoverride All<br />
+</span>
+&lt;/Directory&gt;<br />
+<br />
+&lt;Location /&gt;<br />
+<span class="indent">
+Options +IncludesNoExec -ExecCGI<br />
+</span>
+&lt;/Location&gt;
+    </code></p></div>
+
+
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div>
 <div class="section">
 <h2><a name="auth" id="auth">Authentication example</a></h2>

Modified: httpd/httpd/branches/2.0.x/docs/manual/howto/htaccess.xml
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/docs/manual/howto/htaccess.xml?rev=167971&r1=167970&r2=167971&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/docs/manual/howto/htaccess.xml (original)
+++ httpd/httpd/branches/2.0.x/docs/manual/howto/htaccess.xml Tue May  3 12:54:47 2005
@@ -264,6 +264,37 @@
     permitted, as only <code>Options Includes</code> is in effect, which
     completely overrides any earlier setting that may have been in
     place.</p>
+
+    <section id="merge"><title>Merging of .htaccess with the main
+    configuration files</title>
+
+    <p>As discussed in the documentation on <a
+    href="../sections.html">Configuration Sections</a>,
+    <code>.htaccess</code> files can override the <directive
+    type="section" module="core">Directory</directive> sections for
+    the corresponding directory, but will be overriden by other types
+    of configuration sections from the main configuration files.  This
+    fact can be used to enforce certain configurations, even in the
+    presence of a liberal <directive
+    module="core">AllowOverride</directive> setting.  For example, to
+    prevent script execution while allowing anything else to be set in
+    <code>.htaccess</code> you can use:</p>
+
+    <example>
+&lt;Directory /&gt;<br />
+<indent>
+Allowoverride All<br />
+</indent>
+&lt;/Directory&gt;<br />
+<br />
+&lt;Location /&gt;<br />
+<indent>
+Options +IncludesNoExec -ExecCGI<br />
+</indent>
+&lt;/Location&gt;
+    </example>
+</section>
+
 </section>
 
 <section id="auth"><title>Authentication example</title>



Mime
View raw message