update transformation

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

diff --git a/docs/manual/developer/modules.html.en b/docs/manual/developer/modules.html.en
index 4c6c2fe9a5085bda0a282fbfdedcb22515e0e9ab..4e1e9e2d62971c1a64bba92cb088d7370563821b 100644 (file)
--- a/docs/manual/developer/modules.html.en
+++ b/docs/manual/developer/modules.html.en
@@ -196,6 +196,19 @@ module MODULE_VAR_EXPORT <var>module_name</var>_module =
       far...</p>
 
       <dl>
+        <dt><code>ap_hook_pre_config</code></dt>
+        <dd>do any setup required prior to processing configuration
+        directives</dd>
+
+        <dt><code>ap_hook_check_config</code></dt>
+        <dd>review configuration directive interdependencies</dd>
+
+        <dt><code>ap_hook_test_config</code></dt>
+        <dd>executes only with <code>-t</code> option</dd>
+
+        <dt><code>ap_hook_open_logs</code></dt>
+        <dd>open any specified logs</dd>
+
         <dt><code>ap_hook_post_config</code></dt>
         <dd>this is where the old <code>_init</code> routines get
         registered</dd>
@@ -203,9 +216,6 @@ module MODULE_VAR_EXPORT <var>module_name</var>_module =
         <dt><code>ap_hook_http_method</code></dt>
         <dd>retrieve the http method from a request. (legacy)</dd>
 
-        <dt><code>ap_hook_open_logs</code></dt>
-        <dd>open any specified logs</dd>
-
         <dt><code>ap_hook_auth_checker</code></dt>
         <dd>check if the resource requires authorization</dd>
 

diff --git a/docs/manual/developer/modules.xml.ja b/docs/manual/developer/modules.xml.ja
index b373b17f574985e78b4b345e7763b159a41fdff9..ceeb084307265cd50fbdcef04e5c74f258a5d38c 100644 (file)
--- a/docs/manual/developer/modules.xml.ja
+++ b/docs/manual/developer/modules.xml.ja
@@ -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.en.xsl"?>
-<!-- English Revision: 420993 -->
+<!-- English Revision: 420993:462914 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/developer/modules.xml.meta b/docs/manual/developer/modules.xml.meta
index 850ae5ce822a3e077dd1419d3005cdca705c09b4..a810696c75b41ffa724e74b546399334c55997d4 100644 (file)
--- a/docs/manual/developer/modules.xml.meta
+++ b/docs/manual/developer/modules.xml.meta
@@ -7,6 +7,6 @@
 
   <variants>
     <variant>en</variant>
-    <variant>ja</variant>
+    <variant outdated="yes">ja</variant>
   </variants>
 </metafile>

diff --git a/docs/manual/howto/auth.html.en b/docs/manual/howto/auth.html.en
index 418f5d79ff883ec308379d7b05f3eff61a90fa39..9182d7b1623dd900d653f87cf9179cbecffb6f50 100644 (file)
--- a/docs/manual/howto/auth.html.en
+++ b/docs/manual/howto/auth.html.en
@@ -308,8 +308,8 @@ person in</a></h2>
     <div class="example"><p><code>
       AuthType Basic<br />
       AuthName "By Invitation Only"<br />
-      # Optional line:
-      AuthBasicProvider file
+      # Optional line:<br />
+      AuthBasicProvider file<br />
       AuthUserFile /usr/local/apache/passwd/passwords<br />
       AuthGroupFile /usr/local/apache/passwd/groups<br />
       Require group GroupName
@@ -378,7 +378,8 @@ person in</a></h2>
     AuthType Basic<br />
     AuthBasicProvider dbm<br />
     AuthDBMUserFile /www/passwords/passwd.dbm<br />
-    Require valid-user
+    Require valid-user<br />
+    &lt;/Directory&gt;
     </code></p></div>
 
     <p>Other options are available. Consult the

diff --git a/docs/manual/howto/auth.xml.ja b/docs/manual/howto/auth.xml.ja
index 7d3822d3affd956bb891e7044a419a04a6a2e0a4..c5e6f74e38435c9a3a9d34b0188f9c9dcafe756b 100644 (file)
--- a/docs/manual/howto/auth.xml.ja
+++ b/docs/manual/howto/auth.xml.ja
@@ -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:420993 (outdated) -->
+<!-- English Revision: 219484:453083 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/howto/auth.xml.ko b/docs/manual/howto/auth.xml.ko
index f34a1dfec90ae14dc56988af7f7f269aeaeab28e..9775af7be5ddf7f8d605137da3812c3be73a9a25 100644 (file)
--- a/docs/manual/howto/auth.xml.ko
+++ b/docs/manual/howto/auth.xml.ko
@@ -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:420993 (outdated) -->
+<!-- English Revision: 105989:453083 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/misc/rewriteguide.html.en b/docs/manual/misc/rewriteguide.html.en
index d472c551036dc676b63a3abe4c0d2b2f9fa9b800..98389dc27bf27b8421c68a335ba933f507569828 100644 (file)
--- a/docs/manual/misc/rewriteguide.html.en
+++ b/docs/manual/misc/rewriteguide.html.en
@@ -85,7 +85,7 @@
     to fit in <code>.htaccess</code> context instead
     of per-server context. Always try to understand what a
     particular ruleset really does before you use it. It
-    avoid problems.</div>
+    avoids problems.</div>
 
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">

diff --git a/docs/manual/misc/rewriteguide.xml.ko b/docs/manual/misc/rewriteguide.xml.ko
index f5bf03c4b65371b737c5ec3c5b3e180a11baa965..58658a710dccd4f8483266e51462f546f52ac974 100644 (file)
--- a/docs/manual/misc/rewriteguide.xml.ko
+++ b/docs/manual/misc/rewriteguide.xml.ko
@@ -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: 122770:420990 (outdated) -->
+<!-- English Revision: 122770:449030 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index 333bebce6d5ba8eeec0c814862c8f52925885503..6cf9ede0f40cc06bcc2f437e1027b83e2d455940 100644 (file)
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -1728,8 +1728,8 @@ will be accepted from the client</td></tr>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Limits the size of the HTTP request header allowed from the
 client</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LimitRequestFieldsize <var>bytes</var></code></td></tr>
-<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LimitRequestFieldsize 8190</code></td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LimitRequestFieldSize <var>bytes</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LimitRequestFieldSize 8190</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
 <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
@@ -3092,7 +3092,7 @@ hostname or IP address</td></tr>
       <li>The IP address of the virtual host;</li>
 
       <li>A fully qualified domain name for the IP address of the
-      virtual host;</li>
+      virtual host (not recommended);</li>
 
       <li>The character <code>*</code>, which is used only in combination with
       <code>NameVirtualHost *</code> to match all IP addresses; or</li>

diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de
index 2da125c2fa4a664f709149dc1d89e31e550dfb0f..603f5d64722b62ea69c750fca7bd06fd82bca325 100644 (file)
--- a/docs/manual/mod/core.xml.de
+++ b/docs/manual/mod/core.xml.de
@@ -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: 167959:420990 (outdated) -->
+<!-- English Revision: 167959:449522 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja
index 4508964e9d41193983304a19343b622fb5986a80..9b8bc05fb8fa9547bbb34c017b0cf9750ce56c80 100644 (file)
--- a/docs/manual/mod/core.xml.ja
+++ b/docs/manual/mod/core.xml.ja
@@ -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:420990 (outdated) -->
+<!-- English Revision: 190982:449522 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/mod_headers.html.en b/docs/manual/mod/mod_headers.html.en
index 5f81489239b594b1d64de517f0801380ad4d8912..86302b3bbc6969454a4f7962a45c6f94de2cf0eb 100644 (file)
--- a/docs/manual/mod/mod_headers.html.en
+++ b/docs/manual/mod/mod_headers.html.en
@@ -156,13 +156,21 @@ is available only in Apache 2.0</td></tr></table>
          MyHeader: D=3775428 t=991424704447256 mytext
        </code></p></div>
       </li>
+      <li>Enable DAV to work with Apache running HTTP through SSL hardware
+      (<a href="http://svn.haxx.se/users/archive-2006-03/0549.shtml">problem description</a>) by replacing <var>https:</var> with
+      <var>http:</var> in the <var>Destination</var> header:
+      <div class="example"><p><code>
+        RequestHeader edit Destination ^https: http: early
+      </code></p></div>
+      </li>
+
     </ol>
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="Header" id="Header">Header</a> <a name="header" id="header">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configure HTTP response headers</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Header [<var>condition</var>] set|append|add|unset|echo
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Header [<var>condition</var>] set|append|add|unset|echo|edit
 <var>header</var> [<var>value</var>] [early|env=[!]<var>variable</var>]</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
 <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>FileInfo</td></tr>
@@ -212,6 +220,12 @@ is available only in Apache 2.0</td></tr></table>
     response headers. <var>header</var> may be a 
     <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular expression</a>.
     <var>value</var> must be omitted.</dd>
+
+    <dt><code>edit</code></dt>
+    <dd>If this request header exists, its value is transformed according
+    to a <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular expression</a>
+    search-and-replace.  The <var>value</var> argument is a <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular expression</a>, and the <var>replacement</var>
+    is a replacement string, which may contain backreferences.</dd>
     </dl>
 
     <p>This argument is followed by a <var>header</var> name, which
@@ -256,6 +270,10 @@ is available only in Apache 2.0</td></tr></table>
       more efficient than <code>%s</code>.</p>
     </div> 
 
+    <p>For <code>edit</code> there is both a <var>value</var> argument
+    which is a <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular expression</a>,
+    and an additional <var>replacement</var> string.</p>
+
     <p>The <code class="directive">Header</code> directive may be followed by an
     an additional argument, which may be used to specify conditions under
     which the action will be taken, or may be the keyword <code>early</code>
@@ -278,14 +296,14 @@ is available only in Apache 2.0</td></tr></table>
 <div class="directive-section"><h2><a name="RequestHeader" id="RequestHeader">RequestHeader</a> <a name="requestheader" id="requestheader">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configure HTTP request headers</td></tr>
-<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RequestHeader set|append|add|unset <var>header</var>
-[<var>value</var>] [early|env=[!]<var>variable</var>]</code></td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>RequestHeader set|append|add|unset|edit <var>header</var>
+[<var>value</var>] [<var>replacement</var>] [early|env=[!]<var>variable</var>]</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
 <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>FileInfo</td></tr>
 <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_headers</td></tr>
 </table>
-    <p>This directive can replace, merge or remove HTTP request
+    <p>This directive can replace, merge, change or remove HTTP request
     headers. The header is modified just before the content handler
     is run, allowing incoming headers to be modified. The action it
     performs is determined by the first argument. This can be one
@@ -314,18 +332,27 @@ is available only in Apache 2.0</td></tr></table>
     <dd>The request header of this name is removed, if it exists. If
     there are multiple headers of the same name, all will be removed.
     <var>value</var> must be omitted.</dd>
+
+    <dt><code>edit</code></dt>
+    <dd>If this request header exists, its value is transformed according
+    to a <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular expression</a>
+    search-and-replace.  The <var>value</var> argument is a <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular expression</a>, and the <var>replacement</var>
+    is a replacement string, which may contain backreferences.</dd>
     </dl>
 
     <p>This argument is followed by a header name, which can
     include the final colon, but it is not required. Case is
     ignored. For <code>add</code>, <code>append</code> and
-    <code>set</code> a <var>value</var> is given as the third argument. If
+    <code>set</code> a <var>value</var> is given as the third argument. If a
     <var>value</var> contains spaces, it should be surrounded by double
     quotes. For unset, no <var>value</var> should be given.
     <var>value</var> may be a character string, a string containing format
     specifiers or a combination of both. The supported format specifiers
     are the same as for the <code class="directive"><a href="#header">Header</a></code>,
-    please have a look there for details.</p>
+    please have a look there for details.  For <code>edit</code> both
+    a <var>value</var> and a <var>replacement</var> are required, and are
+    a <a class="glossarylink" href="../glossary.html#regex" title="see glossary">regular expression</a> and a
+    replacement string respectively.</p>
 
     <p>The <code class="directive">RequestHeader</code> directive may be followed by
     an additional argument, which may be used to specify conditions under

diff --git a/docs/manual/mod/mod_headers.xml.ja b/docs/manual/mod/mod_headers.xml.ja
index 6b404b3dc9ed61d04a44c831691fc2948fbe3e93..7190dcb68f9d9361fdc3e1fe6f418523eafebf20 100644 (file)
--- a/docs/manual/mod/mod_headers.xml.ja
+++ b/docs/manual/mod/mod_headers.xml.ja
@@ -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: 151408:420990 (outdated) -->
+<!-- English Revision: 151408:462917 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/mod_headers.xml.ko b/docs/manual/mod/mod_headers.xml.ko
index 637b579d970fcd4418d4bf2f1205de0e7c36ccea..cc8813242f898ef67f0a0d40ae1aa2ddee88a5ce 100644 (file)
--- a/docs/manual/mod/mod_headers.xml.ko
+++ b/docs/manual/mod/mod_headers.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 151408:420990 (outdated) -->
+<!-- English Revision: 151408:462917 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/mod_info.html.en b/docs/manual/mod/mod_info.html.en
index 33bb47c2e4b50bd5d545120fba20160a6f1ce527..caf8d452bc6a4c7e88a312650c5bec2d7541cb5b 100644 (file)
--- a/docs/manual/mod/mod_info.html.en
+++ b/docs/manual/mod/mod_info.html.en
@@ -45,7 +45,7 @@ configuration</td></tr>
 
     <p>You may wish to use <code class="module"><a href="../mod/mod_access.html">mod_access</a></code> inside the
     <code class="directive"><a href="../mod/core.html#location">&lt;Location&gt;</a></code>
-    directive to limite access to your server configuration
+    directive to limit access to your server configuration
     information:</p>
 
     <div class="example"><p><code>

diff --git a/docs/manual/mod/mod_info.xml.ja b/docs/manual/mod/mod_info.xml.ja
index ec295a287210d0adb2f2707b3c12a09d9b37adf1..0ad897659703d9f6d373acd8ef4b70caf790a615 100644 (file)
--- a/docs/manual/mod/mod_info.xml.ja
+++ b/docs/manual/mod/mod_info.xml.ja
@@ -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: 151408:420990 (outdated) -->
+<!-- English Revision: 151408:450473 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/mod_info.xml.ko b/docs/manual/mod/mod_info.xml.ko
index 6cc8fbe55445a8c6b01eb2e8312e71149c76ef72..99ed5b8490708e45b397db02353bd597e3f3a110 100644 (file)
--- a/docs/manual/mod/mod_info.xml.ko
+++ b/docs/manual/mod/mod_info.xml.ko
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="EUC-KR" ?>
 <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 125277:420990 (outdated) -->
+<!-- English Revision: 125277:450473 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/mod_proxy_balancer.html.en b/docs/manual/mod/mod_proxy_balancer.html.en
index ae470a7b0298d36409f178e9f32b20b641de5ee5..dbe92e73c7121c6613b7ed1b4bff72bab7d981bc 100644 (file)
--- a/docs/manual/mod/mod_proxy_balancer.html.en
+++ b/docs/manual/mod/mod_proxy_balancer.html.en
@@ -278,10 +278,10 @@ candidate lbstatus -= total factor</code></pre></div>
 <div class="section">
 <h2><a name="environment" id="environment">Exported Environment Variables</a></h2>
     
-    <p>At present there are 5 environment variables exported:</p>
-    
-    
+    <p>At present there are 6 environment variables exported:</p>
+
     <dl>
+    
     <dt><var><a name="balancer_session_sticky" id="balancer_session_sticky">BALANCER_SESSION_STICKY</a></var></dt>
     <dd>
     <p>This is assigned the <var>stickysession</var> value used in the current
@@ -315,6 +315,16 @@ candidate lbstatus -= total factor</code></pre></div>
     <p>This is assigned the <var>route</var> of the worker that will be 
     used for the current request.</p>
     </dd>
+
+    
+    <dt><var><a name="balancer_route_changed" id="balancer_route_changed">BALANCER_ROUTE_CHANGED</a></var></dt>
+    <dd>
+    <p>This is set to 1 if the session route does not match the
+    worker route (BALANCER_SESSION_ROUTE != BALANCER_WORKER_ROUTE) or the
+    session does not yet have an established route.  This can be used to
+    determine when/if the client needs to be sent an updated route
+    when sticky sessions are used.</p>
+    </dd>
     </dl>
 
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>

diff --git a/docs/manual/mod/mod_proxy_balancer.xml.ja b/docs/manual/mod/mod_proxy_balancer.xml.ja
index cdcbf15459eb62d8417650ffe1f97e84c4d9cae8..b5f46504a7060a0496f734b0dc26fb15859a0561 100644 (file)
--- a/docs/manual/mod/mod_proxy_balancer.xml.ja
+++ b/docs/manual/mod/mod_proxy_balancer.xml.ja
@@ -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: 395228:437773 (outdated) -->
+<!-- English Revision: 395228:453630 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en
index 0e2d5812a588c8b0e3bca8a1bab599bb48b7eaab..3d38a70762e9b3617c16ed5c1e0417ec61f27bd1 100644 (file)
--- a/docs/manual/mod/mod_rewrite.html.en
+++ b/docs/manual/mod/mod_rewrite.html.en
@@ -976,6 +976,26 @@ while (<STDIN>) {
             synchronization takes place.</li>
           </ol>
         </li>
+        <li>
+          <p><strong>SQL Query</strong><br />
+           MapType: <code>dbd</code> or <code>fastdbd</code>,
+           MapSource: An SQL SELECT statement that takes a single
+                      argument and returns a single value.</p>
+          <p>This uses <code class="module"><a href="../mod/mod_dbd.html">mod_dbd</a></code> to implement a rewritemap
+          by lookup in an SQL database.  There are two forms:
+          <code>fastdbd</code> caches database lookups internally,
+          <code>dbd</code> doesn't.  So <code>dbd</code> incurs a
+          performance penalty but responds immediately if the database
+          contents are updated, while <code>fastdbd</code> is more
+          efficient but won't re-read database contents until server
+          restart.</p>
+          <p>If a query returns more than one row, a random row from
+          the result set is used.</p>
+<div class="example"><h3>Example</h3><p><code>
+
+RewriteMap myquery "fastdbd:SELECT destination FROM rewrite WHERE source = %s"
+</code></p></div>
+        </li>
       </ul>
       <p>The <code class="directive">RewriteMap</code> directive can occur more than
       once. For each mapping-function use one

diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en
index d32a5cfd476d9c3926c839d16a33ebb16354c8e1..004912dbf833b023c266bf0b7ef7d251f062ab9a 100644 (file)
--- a/docs/manual/mod/quickreference.html.en
+++ b/docs/manual/mod/quickreference.html.en
@@ -344,7 +344,7 @@ MIME content-type</td></tr>
 will exit.</td></tr>
 <tr><td><a href="mpm_common.html#group">Group <var>unix-group</var></a></td><td> #-1 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Group under which the server will answer
 requests</td></tr>
-<tr class="odd"><td><a href="mod_headers.html#header" id="H" name="H">Header [<var>condition</var>] set|append|add|unset|echo
+<tr class="odd"><td><a href="mod_headers.html#header" id="H" name="H">Header [<var>condition</var>] set|append|add|unset|echo|edit
 <var>header</var> [<var>value</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Configure HTTP response headers</td></tr>
 <tr><td><a href="mod_autoindex.html#headername">HeaderName <var>filename</var></a></td><td></td><td>svdh</td><td>B</td></tr><tr><td class="descr" colspan="4">Name of the file that will be inserted at the top
 of the index listing</td></tr>
@@ -420,7 +420,7 @@ subrequests</td></tr>
 from the client</td></tr>
 <tr class="odd"><td><a href="core.html#limitrequestfields">LimitRequestFields <var>number</var></a></td><td> 100 </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limits the number of HTTP request header fields that
 will be accepted from the client</td></tr>
-<tr><td><a href="core.html#limitrequestfieldsize">LimitRequestFieldsize <var>bytes</var></a></td><td></td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the size of the HTTP request header allowed from the
+<tr><td><a href="core.html#limitrequestfieldsize">LimitRequestFieldSize <var>bytes</var></a></td><td> 8190 </td><td>s</td><td>C</td></tr><tr><td class="descr" colspan="4">Limits the size of the HTTP request header allowed from the
 client</td></tr>
 <tr class="odd"><td><a href="core.html#limitrequestline">LimitRequestLine <var>bytes</var></a></td><td> 8190 </td><td>s</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Limit the size of the HTTP request line that will be accepted
 from the client</td></tr>
@@ -569,8 +569,8 @@ extensions</td></tr>
 <tr class="odd"><td><a href="mod_mime.html#removetype">RemoveType <var>extension</var> [<var>extension</var>]
 ...</a></td><td></td><td>vdh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Removes any content type associations for a set of file
 extensions</td></tr>
-<tr><td><a href="mod_headers.html#requestheader">RequestHeader set|append|add|unset <var>header</var>
-[<var>value</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure HTTP request headers</td></tr>
+<tr><td><a href="mod_headers.html#requestheader">RequestHeader set|append|add|unset|edit <var>header</var>
+[<var>value</var>] [<var>replacement</var>] [early|env=[!]<var>variable</var>]</a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Configure HTTP request headers</td></tr>
 <tr class="odd"><td><a href="mod_authz_core.html#require">Require <var>entity-name</var> [<var>entity-name</var>] ...</a></td><td></td><td>dh</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Selects which authenticated users can access
 a resource</td></tr>
 <tr><td><a href="mod_rewrite.html#rewritebase">RewriteBase <em>URL-path</em></a></td><td></td><td>dh</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets the base URL for per-directory rewrites</td></tr>

diff --git a/docs/manual/new_features_2_4.html.en b/docs/manual/new_features_2_4.html.en
index 20c0a53d487e8a802fa7b9b3583fef9d70713214..4f18369728072ee119f9e0731528fa29487e0abf 100644 (file)
--- a/docs/manual/new_features_2_4.html.en
+++ b/docs/manual/new_features_2_4.html.en
@@ -40,7 +40,13 @@
 <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">
@@ -51,7 +57,20 @@
 <div class="section">
 <h2><a name="developer" id="developer">Module Developer Changes</a></h2>
     
-    
+    <dl>
+      <dt>Check Configuration Hook Added</dt>
+
+      <dd>A new hook, <code>check_config</code>, has been added which runs
+          between the <code>pre_config</code> and <code>open_logs</code>
+          hooks.  It also runs before the <code>test_config</code> hook
+          when the <code>-t</code> option is passed to
+          <code class="program"><a href="./programs/httpd.html">httpd</a></code>.  The <code>check_config</code> hook
+          allows modules to review interdependent configuration directive
+          values and adjust them while messages can still be logged to the
+          console.  The user can thus be alerted to misconfiguration problems
+          before the core <code>open_logs</code> hook function redirects
+          console output to the error log.</dd>
+    </dl>
   </div></div>
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="./en/new_features_2_4.html" title="English">&nbsp;en&nbsp;</a></p>