httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chr...@apache.org
Subject svn commit: r483755 - in /httpd/httpd/trunk/docs/manual: ./ howto/ mod/
Date Fri, 08 Dec 2006 00:21:07 GMT
Author: chrisd
Date: Thu Dec  7 16:21:04 2006
New Revision: 483755

URL: http://svn.apache.org/viewvc?view=rev&rev=483755
Log:
remove mod_headers edit feature from new_features_2_4.xml
(back-ported to 2.2.x) and update transformation

Modified:
    httpd/httpd/trunk/docs/manual/howto/auth.html.en
    httpd/httpd/trunk/docs/manual/howto/auth.xml.ja
    httpd/httpd/trunk/docs/manual/howto/auth.xml.ko
    httpd/httpd/trunk/docs/manual/mod/mod_access_compat.html.en
    httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.de
    httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.ja
    httpd/httpd/trunk/docs/manual/mod/quickreference.html.en
    httpd/httpd/trunk/docs/manual/new_features_2_4.html.en
    httpd/httpd/trunk/docs/manual/new_features_2_4.xml

Modified: httpd/httpd/trunk/docs/manual/howto/auth.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/auth.html.en?view=diff&rev=483755&r1=483754&r2=483755
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/auth.html.en (original)
+++ httpd/httpd/trunk/docs/manual/howto/auth.html.en Thu Dec  7 16:21:04 2006
@@ -456,7 +456,7 @@
         has been brought forward into authorization as well. What this means is 
         that the <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code>
directive 
         not only specifies which authorization methods should be used, it also 
-        specifies the order in which they are called. Multiple autorization 
+        specifies the order in which they are called. Multiple authorization 
         methods are called in the same order in which the 
         <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code>
directives appear 
         in the configuration.</p>

Modified: httpd/httpd/trunk/docs/manual/howto/auth.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/auth.xml.ja?view=diff&rev=483755&r1=483754&r2=483755
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/auth.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/trunk/docs/manual/howto/auth.xml.ja [iso-2022-jp] Thu Dec  7 16:21:04 2006
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='iso-2022-jp' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 219484:453083 (outdated) -->
+<!-- English Revision: 219484:479777 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/howto/auth.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/auth.xml.ko?view=diff&rev=483755&r1=483754&r2=483755
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/auth.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/howto/auth.xml.ko [euc-kr] Thu Dec  7 16:21:04 2006
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='EUC-KR' ?>
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 105989:453083 (outdated) -->
+<!-- English Revision: 105989:479777 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/mod/mod_access_compat.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_access_compat.html.en?view=diff&rev=483755&r1=483754&r2=483755
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_access_compat.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_access_compat.html.en Thu Dec  7 16:21:04 2006
@@ -96,7 +96,7 @@
 </table>
     <p>The <code class="directive">Allow</code> directive affects which
hosts can
     access an area of the server. Access can be controlled by
-    hostname, IP Address, IP Address range, or by other
+    hostname, IP address, IP address range, or by other
     characteristics of the client request captured in environment
     variables.</p>
 
@@ -238,39 +238,79 @@
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_access_compat</td></tr>
 </table>
-    <p>The <code class="directive">Order</code> directive controls the
default
-    access state and the order in which <code class="directive"><a href="#allow">Allow</a></code>
and <code class="directive"><a href="#deny">Deny</a></code> directives
are evaluated.
-    <var>Ordering</var> is one of</p>
+
+    <p>The <code class="directive">Order</code> directive, along with the
+    <code class="directive"><a href="#allow">Allow</a></code> and
+    <code class="directive"><a href="#deny">Deny</a></code> directives,
+    controls a three-pass access control system. The first pass
+    processes either all <code class="directive"><a href="#allow">Allow</a></code>
or all <code class="directive"><a href="#deny">Deny</a></code> directives,
as specified
+    by the <code class="directive"><a href="#order">Order</a></code>
+    directive. The second pass parses the rest of the directives
+    (<code class="directive"><a href="#deny">Deny</a></code> or
+    <code class="directive"><a href="#allow">Allow</a></code>). The
third
+    pass applies to all requests which do not match either of the first
+    two.</p>
+
+    <p>Note that all <code class="directive"><a href="#allow">Allow</a></code>
and <code class="directive"><a href="#deny">Deny</a></code> directives
are
+    processed, unlike a typical firewall, where only the first match is
+    used. The last match is effective (also unlike a typical firewall).
+    Additionally, the order in which lines appear in the configuration
+    files is not significant -- all <code class="directive"><a href="#allow">Allow</a></code>
lines are processed as
+    one group, all <code class="directive"><a href="#deny">Deny</a></code>
lines are considered as
+    another, and the default state is considered by itself.</p>
+
+    <p><em>Ordering</em> is one of:</p>
 
     <dl>
       <dt><code>Deny,Allow</code></dt>
 
-      <dd>The <code class="directive"><a href="#deny">Deny</a></code>
directives
-      are evaluated before the <code class="directive"><a href="#allow">Allow</a></code>
directives. Access is
-      allowed by default. Any client which does not match a
-      <code class="directive"><a href="#deny">Deny</a></code> directive
or does
-      match an <code class="directive"><a href="#allow">Allow</a></code>
-      directive will be allowed access to the server.</dd>
+      <dd>First, all <code class="directive"><a href="#allow">Allow</a></code>
directives are
+      evaluated; at least one must match, or the request is rejected.
+      Next, all <code class="directive"><a href="#deny">Deny</a></code>
+      directives are evaluated. If any matches, the request is rejected.
+      Last, any requests which do not match an <code class="directive"><a href="#allow">Allow</a></code>
or a <code class="directive"><a href="#deny">Deny</a></code> directive
are denied
+      by default.</dd>
 
       <dt><code>Allow,Deny</code></dt>
 
-      <dd>The <code class="directive"><a href="#allow">Allow</a></code>
-      directives are evaluated before the <code class="directive"><a href="#deny">Deny</a></code>
directives. Access is denied
-      by default. Any client which does not match an <code class="directive"><a
href="#allow">Allow</a></code> directive or does match a
-      <code class="directive"><a href="#deny">Deny</a></code> directive
will be
-      denied access to the server.</dd>
+      <dd>First, all <code class="directive"><a href="#deny">Deny</a></code>
directives are
+      evaluated; if any match, the request is denied
+      <strong>unless</strong> it also matches an <code class="directive"><a
href="#allow">Allow</a></code> directive. Any
+      requests which do not match any <code class="directive"><a href="#allow">Allow</a></code>
or <code class="directive"><a href="#deny">Deny</a></code> directives
are
+      permitted.</dd>
 
       <dt><code>Mutual-failure</code></dt>
 
-      <dd>Only those hosts which appear on the <code class="directive"><a
href="#allow">Allow</a></code> list and do not appear on
-      the <code class="directive"><a href="#deny">Deny</a></code>
list are
-      granted access. This ordering has the same effect as <code>Order
-      Allow,Deny</code> and is deprecated in favor of that
-      configuration.</dd>
+      <dd>This order has the same effect as <code class="directive">Order
+      Allow,Deny</code> and is deprecated in its favor.</dd>
     </dl>
 
-    <p>Keywords may only be separated by a comma; <em>no whitespace</em>
is
-    allowed between them. Note that in all cases every <code class="directive"><a
href="#allow">Allow</a></code> and <code class="directive"><a href="#deny">Deny</a></code>
statement is evaluated.</p>
+    <p>Keywords may only be separated by a comma; <em>no whitespace</em>
+    is allowed between them.</p>
+
+    <table class="bordered">
+      <tr>
+        <th>Match</th>
+        <th>Allow,Deny result</th>
+        <th>Deny,Allow result</th>
+      </tr><tr>
+        <th>Match Allow only</th>
+        <td>Request allowed</td>
+        <td>Request allowed</td>
+      </tr><tr>
+        <th>Match Deny only</th>
+        <td>Request denied</td>
+        <td>Request denied</td>
+      </tr><tr>
+        <th>No match</th>
+        <td>Default to second directive: Denied</td>
+        <td>Default to second directive: Allowed</td>
+      </tr><tr>
+        <th>Match both Allow &amp; Deny</th>
+        <td>Final match controls: Denied</td>
+        <td>Final match controls: Allowed</td>
+      </tr>
+    </table>
 
     <p>In the following example, all hosts in the apache.org domain
     are allowed access; all other hosts are denied access.</p>
@@ -285,7 +325,8 @@
     allowed access, except for the hosts which are in the
     foo.apache.org subdomain, who are denied access. All hosts not
     in the apache.org domain are denied access because the default
-    state is to deny access to the server.</p>
+    state is to <code class="directive"><a href="#deny">Deny</a></code>
+    access to the server.</p>
 
     <div class="example"><p><code>
       Order Allow,Deny<br />
@@ -293,20 +334,21 @@
       Deny from foo.apache.org
     </code></p></div>
 
-    <p>On the other hand, if the <code class="directive">Order</code> in
the last
-    example is changed to <code>Deny,Allow</code>, all hosts will
-    be allowed access. This happens because, regardless of the
-    actual ordering of the directives in the configuration file,
-    the <code>Allow from apache.org</code> will be evaluated last
-    and will override the <code>Deny from foo.apache.org</code>.
-    All hosts not in the <code>apache.org</code> domain will also
-    be allowed access because the default state will change to
-    <em>allow</em>.</p>
-
-    <p>The presence of an <code class="directive">Order</code> directive
can affect
-    access to a part of the server even in the absence of accompanying
-    <code class="directive"><a href="#allow">Allow</a></code> and
<code class="directive"><a href="#deny">Deny</a></code> directives
because of its effect
-    on the default access state. For example,</p>
+    <p>On the other hand, if the <code class="directive">Order</code> in
the
+    last example is changed to <code>Deny,Allow</code>, all hosts will
+    be allowed access. This happens because, regardless of the actual
+    ordering of the directives in the configuration file, the
+    <code>Allow from apache.org</code> will be evaluated last and will
+    override the <code>Deny from foo.apache.org</code>. All hosts not in
+    the <code>apache.org</code> domain will also be allowed access
+    because the default state is <code class="directive"><a href="#allow">Allow</a></code>.</p>
+
+    <p>The presence of an <code class="directive">Order</code> directive
can
+    affect access to a part of the server even in the absence of
+    accompanying <code class="directive"><a href="#allow">Allow</a></code>
+    and <code class="directive"><a href="#deny">Deny</a></code>
+    directives because of its effect on the default access state. For
+    example,</p>
 
     <div class="example"><p><code>
       &lt;Directory /www&gt;<br />
@@ -316,9 +358,9 @@
       &lt;/Directory&gt;
     </code></p></div>
 
-    <p>will deny all access to the <code>/www</code> directory
-    because the default access state will be set to
-    <em>deny</em>.</p>
+    <p>will Deny all access to the <code>/www</code> directory
+    because the default access state is set to
+    <code class="directive"><a href="#deny">Deny</a></code>.</p>
 
     <p>The <code class="directive">Order</code> directive controls the
order of access
     directive processing only within each phase of the server's

Modified: httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.de
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.de?view=diff&rev=483755&r1=483754&r2=483755
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.de (original)
+++ httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.de Thu Dec  7 16:21:04 2006
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 151408:468892 (outdated) -->
+<!-- English Revision: 151408:478131 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.ja?view=diff&rev=483755&r1=483754&r2=483755
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.ja [iso-2022-jp] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.ja [iso-2022-jp] Thu Dec  7 16:21:04
2006
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-2022-jp"?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 190982:468892 (outdated) -->
+<!-- English Revision: 190982:478131 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/httpd/trunk/docs/manual/mod/quickreference.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/quickreference.html.en?view=diff&rev=483755&r1=483754&r2=483755
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/quickreference.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/quickreference.html.en Thu Dec  7 16:21:04 2006
@@ -440,7 +440,7 @@
 <tr><td><a href="core.html#locationmatch">&lt;LocationMatch
     <var>regex</var>&gt; ... &lt;/LocationMatch&gt;</a></td><td></td><td>sv</td><td>C</td></tr><tr><td
class="descr" colspan="4">Applies the enclosed directives only to regular-expression
 matching URLs</td></tr>
-<tr class="odd"><td><a href="mpm_common.html#lockfile">LockFile <var>filename</var></a></td><td>
logs/accept.lock </td><td>s</td><td>M</td></tr><tr
class="odd"><td class="descr" colspan="4">Location of the accept serialization lock
file <em>(depreciated)</em></td></tr>
+<tr class="odd"><td><a href="mpm_common.html#lockfile">LockFile <var>filename</var></a></td><td>
logs/accept.lock </td><td>s</td><td>M</td></tr><tr
class="odd"><td class="descr" colspan="4">Location of the accept serialization lock
file <em>(deprecated)</em></td></tr>
 <tr><td><a href="mod_log_config.html#logformat">LogFormat <var>format</var>|<var>nickname</var>
 [<var>nickname</var>]</a></td><td> "%h %l %u %t \"%r\" +</td><td>sv</td><td>B</td></tr><tr><td
class="descr" colspan="4">Describes a format for use in a log file</td></tr>
 <tr class="odd"><td><a href="core.html#loglevel">LogLevel <var>level</var></a></td><td>
warn </td><td>sv</td><td>C</td></tr><tr class="odd"><td
class="descr" colspan="4">Controls the verbosity of the ErrorLog</td></tr>

Modified: httpd/httpd/trunk/docs/manual/new_features_2_4.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/new_features_2_4.html.en?view=diff&rev=483755&r1=483754&r2=483755
==============================================================================
--- httpd/httpd/trunk/docs/manual/new_features_2_4.html.en (original)
+++ httpd/httpd/trunk/docs/manual/new_features_2_4.html.en Thu Dec  7 16:21:04 2006
@@ -40,14 +40,7 @@
 <div class="section">
 <h2><a name="module" id="module">Module Enhancements</a></h2>
     
-    <dl>
-      <dt><code class="module"><a href="./mod/mod_headers.html">mod_headers</a></code></dt>
-
-      <dd>Using the new <code>edit</code> argument, header values may
-          be edited using a regular expression search-and-replace
-          operation.</dd>
-    </dl>
-
+    
   </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif"
/></a></div>
 <div class="section">
 <h2><a name="programs" id="programs">Program Enhancements</a></h2>

Modified: httpd/httpd/trunk/docs/manual/new_features_2_4.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/new_features_2_4.xml?view=diff&rev=483755&r1=483754&r2=483755
==============================================================================
--- httpd/httpd/trunk/docs/manual/new_features_2_4.xml (original)
+++ httpd/httpd/trunk/docs/manual/new_features_2_4.xml Thu Dec  7 16:21:04 2006
@@ -39,14 +39,8 @@
 
   <section id="module">
     <title>Module Enhancements</title>
-    <dl>
-      <dt><module>mod_headers</module></dt>
-
-      <dd>Using the new <code>edit</code> argument, header values may
-          be edited using a regular expression search-and-replace
-          operation.</dd>
-    </dl>
-
+    <!-- <dl>
+    </dl> -->
   </section>
 
   <section id="programs">



Mime
View raw message