You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by pq...@apache.org on 2008/04/07 18:31:24 UTC

svn commit: r645594 [10/28] - in /httpd/sandbox/amsterdam/d: ./ build/ docs/conf/ docs/conf/extra/ docs/man/ docs/manual/ docs/manual/developer/ docs/manual/faq/ docs/manual/howto/ docs/manual/misc/ docs/manual/mod/ docs/manual/platform/ docs/manual/pr...

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_filter.xml
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_filter.xml?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_filter.xml (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_filter.xml Mon Apr  7 09:28:58 2008
@@ -111,12 +111,14 @@
     declare it with the default type AP_FTYPE_RESOURCE. The provider
     must have been
     registered with <code>ap_register_output_filter</code> by some module.
-    The remaining arguments to <directive module="mod_filter"
-    >FilterProvider</directive> are a dispatch criterion and a match string.
-    The former may be an HTTP request or response header, an environment
-    variable, or the Handler used by this request.  The latter is matched
-    to it for each request, to determine whether this provider will be
-    used to implement the filter for this request.</dd>
+    The final argument to <directive module="mod_filter"
+    >FilterProvider</directive> is an expression: the provider will be
+    selected to run for a request if and only if the expression evaluates
+    to true.  The expression may evaluate HTTP request or response
+    headers, environment variables, or the Handler used by this request.
+    Unlike earlier versions, mod_filter now supports complex expressions
+    involving multiple criteria with AND / OR logic (&amp;&amp; / ||)
+    and brackets.</dd>
 
     <dt>Configure the Chain</dt>
     <dd>The above directives build components of a smart filter chain,
@@ -126,6 +128,23 @@
     beginning or end of the chain, remove a filter, or clear the chain.</dd>
 </dl>
 </section>
+<section id="upgrade"><title>Upgrading from HTTPD 2.2 Configuration</title>
+    <p>The <directive module="mod_filter">FilterProvider</directive>
+    directive has changed from HTTPD 2.2: the <var>match</var> and
+    <var>dispatch</var> arguments are replaced with a single but
+    more versatile <var>expression</var>.  In general, you can convert
+    a match/dispatch pair to the two sides of an expression, using
+    something like:</p>
+    <example>"dispatch = match"</example>
+    <p>The Request headers, Response headers and Environment variables
+    are now interpreted from syntax <var>$req{foo}</var>,
+    <var>$resp{foo}</var> and <var>$env{foo}</var> respectively.
+    The variables <var>$handler</var> and <var>$Content-Type</var>
+    are also supported.</p>
+    <p>Note that the match no longer supports integer comparisons
+    or substring matches.  The latter can be replaced by regular
+    expression matches.</p>
+</section>
 
 <section id="examples"><title>Examples</title>
     <dl>
@@ -134,7 +153,7 @@
     <directive module="core">AddOutputFilterByType</directive>
     <example>
       FilterDeclare SSI<br/>
-      FilterProvider SSI INCLUDES resp=Content-Type $text/html<br/>
+      FilterProvider SSI INCLUDES "$resp{Content-Type} = /^text\/html/"<br/>
       FilterChain SSI
     </example>
     </dd>
@@ -143,7 +162,7 @@
     <dd>The same as the above but dispatching on handler (classic
     SSI behaviour; .shtml files get processed).
     <example>
-      FilterProvider SSI INCLUDES Handler server-parsed<br/>
+      FilterProvider SSI INCLUDES "Handler = server-parsed"<br/>
       FilterChain SSI
     </example>
     </dd>
@@ -153,7 +172,7 @@
     Accept-Encoding header.  This filter runs with ftype CONTENT_SET.
     <example>
       FilterDeclare gzip CONTENT_SET<br/>
-      FilterProvider gzip inflate req=Accept-Encoding !$gzip<br/>
+      FilterProvider gzip inflate "$req{Accept-Encoding} != /gzip/"<br/>
       FilterChain gzip
     </example>
     </dd>
@@ -162,16 +181,16 @@
     <dd>Suppose we want to downsample all web images, and have filters
     for GIF, JPEG and PNG.
     <example>
-      FilterProvider unpack jpeg_unpack Content-Type $image/jpeg<br/>
-      FilterProvider unpack gif_unpack Content-Type $image/gif<br/>
-      FilterProvider unpack png_unpack Content-Type $image/png<br/>
+      FilterProvider unpack jpeg_unpack "$resp{Content-Type} = image/jpeg"<br/>
+      FilterProvider unpack gif_unpack "$resp{Content-Type} = image/gif"<br/>
+      FilterProvider unpack png_unpack "$resp{Content-Type} = image/png"<br/>
       <br />
-      FilterProvider downsample downsample_filter Content-Type $image<br/>
+      FilterProvider downsample downsample_filter "$resp{Content-Type} = /image\/(jpeg|gif|png)/"<br/>
       FilterProtocol downsample "change=yes"<br/>
       <br />
-      FilterProvider repack jpeg_pack Content-Type $image/jpeg<br/>
-      FilterProvider repack gif_pack Content-Type $image/gif<br/>
-      FilterProvider repack png_pack Content-Type $image/png<br/>
+      FilterProvider repack jpeg_pack "$resp{Content-Type} = image/jpeg"<br/>
+      FilterProvider repack gif_pack "$resp{Content-Type} = image/gif"<br/>
+      FilterProvider repack png_pack "$resp{Content-Type} = image/png"<br/>
       &lt;Location /image-filter&gt;<br/>
       <indent>
         FilterChain unpack downsample repack<br/>
@@ -252,63 +271,67 @@
 <name>FilterProvider</name>
 <description>Register a content filter</description>
 <syntax>FilterProvider <var>filter-name</var> <var>provider-name</var>
- [req|resp|env]=<var>dispatch</var> <var>match</var></syntax>
+ <var>expression</var></syntax>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context><context>.htaccess</context></contextlist>
 <override>Options</override>
 
 <usage>
     <p>This directive registers a <em>provider</em> for the smart filter.
-    The provider will be called if and only if the <var>match</var> declared
-    here matches the value of the header or environment variable declared
-    as <var>dispatch</var>.</p>
+    The provider will be called if and only if the <var>expression</var>
+    declared evaluates to true when the harness is first called.</p>
 
     <p>
     <var>provider-name</var> must have been registered by loading
     a module that registers the name with
     <code>ap_register_output_filter</code>.
-<!-- Placeholder; this is totally broken as of now
-     , or declared with
-    <directive module="mod_filter">FilterDeclare</directive>
-    (or implicitly with another
-    <directive module="mod_filter">FilterProvider</directive>).
--->
     </p>
 
-    <p>The <var>dispatch</var> argument is a string with optional
-    <code>req=</code>, <code>resp=</code> or <code>env=</code> prefix
-    causing it to dispatch on (respectively) the request header, response
-    header, or environment variable named.  In the absence of a
-    prefix, it defaults to a response header.  A special case is the
-    word <code>handler</code>, which causes <module>mod_filter</module>
-    to dispatch on the content handler.</p>
-
-    <p>The <var>match</var> argument specifies a match that will be applied to
-    the filter's <var>dispatch</var> criterion.  The <var>match</var> may be
-    a string match (exact match or substring), a <glossary ref="regex"
-    >regex</glossary>, an integer (greater, lessthan or equals), or
-    unconditional.  The first characters of the <var>match</var> argument
-    determines this:</p>
-
-    <p><strong>First</strong>, if the first character is an exclamation mark
-    (<code>!</code>), this reverses the rule, so the provider will be used
-    if and only if the match <em>fails</em>.</p>
-
-    <p><strong>Second</strong>, it interprets the first character excluding
-    any leading <code>!</code> as follows:</p>
-
-    <table style="zebra" border="yes">
-    <tr><th>Character</th><th>Description</th></tr>
-    <tr><td><em>(none)</em></td><td>exact match</td></tr>
-    <tr><td><code>$</code></td><td>substring match</td></tr>
-    <tr><td><code>/</code></td><td>regex match (delimited by a second <code>/</code>)</td></tr>
-    <tr><td><code>=</code></td><td>integer equality</td></tr>
-    <tr><td><code>&lt;</code></td><td>integer less-than</td></tr>
-    <tr><td><code>&lt;=</code></td><td>integer less-than or equal</td></tr>
-    <tr><td><code>&gt;</code></td><td>integer greater-than</td></tr>
-    <tr><td><code>&gt;=</code></td><td>integer greater-than or equal</td></tr>
-    <tr><td><code>*</code></td><td>Unconditional match</td></tr>
-    </table>
+    <p><var>expression</var> can be any of the following:</p>
+    <dl>
+      <dt><code><var>string</var></code></dt>
+      <dd>true if <var>string</var> is not empty</dd>
+
+      <dt><code><var>string1</var> = <var>string2</var><br />
+      <var>string1</var> == <var>string2</var><br />
+      <var>string1</var> != <var>string2</var></code></dt>
+
+      <dd><p>Compare <var>string1</var> with <var>string2</var>. If
+      <var>string2</var> has the form <code>/<var>string2</var>/</code>
+      then it is treated as a regular expression. Regular expressions are
+      implemented by the <a href="http://www.pcre.org">PCRE</a> engine and
+      have the same syntax as those in <a href="http://www.perl.com">perl
+      5</a>. Note that <code>==</code> is just an alias for <code>=</code>
+      and behaves exactly the same way.</p>
+      </dd>
+
+      <dt><code><var>string1</var> &lt; <var>string2</var><br />
+       <var>string1</var> &lt;= <var>string2</var><br />
+       <var>string1</var> &gt; <var>string2</var><br />
+       <var>string1</var> &gt;= <var>string2</var></code></dt>
+
+      <dd>Compare <var>string1</var> with <var>string2</var>. Note, that
+      strings are compared <em>literally</em> (using
+      <code>strcmp(3)</code>). Therefore the string "100" is less than
+      "20".</dd>
+
+      <dt><code>( <var>expression</var> )</code></dt>
+      <dd>true if <var>expression</var> is true</dd>
+
+      <dt><code>! <var>expression</var></code></dt>
+      <dd>true if <var>expression</var> is false</dd>
+
+      <dt><code><var>expression1</var> &amp;&amp;
+        <var>expression2</var></code></dt>
+      <dd>true if both <var>expression1</var> and
+      <var>expression2</var> are true</dd>
+
+      <dt><code><var>expression1</var> ||
+        <var>expression2</var></code></dt>
+      <dd>true if either <var>expression1</var> or
+      <var>expression2</var> is true</dd>
+    </dl>
+
 </usage>
 </directivesynopsis>
 

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_headers.html
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_headers.html?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_headers.html (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_headers.html Mon Apr  7 09:28:58 2008
@@ -2,9 +2,9 @@
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_headers.html.ja.euc-jp
+URI: mod_headers.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_headers.html.ko.euc-kr
 Content-Language: ko

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_headers.html.en
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_headers.html.en?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_headers.html.en (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_headers.html.en Mon Apr  7 09:28:58 2008
@@ -429,6 +429,6 @@
 <a href="../ja/mod/mod_headers.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_headers.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_headers.html.ko.euc-kr
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_headers.html.ko.euc-kr?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_headers.html.ko.euc-kr [euc-kr] (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_headers.html.ko.euc-kr [euc-kr] Mon Apr  7 09:28:58 2008
@@ -334,6 +334,6 @@
 <a href="../ja/mod/mod_headers.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_headers.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">모듈</a> | <a href="../mod/directives.html">지시어들</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">용어</a> | <a href="../sitemap.html">사이트맵</a></p></div>
 </body></html>

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_ident.html.en
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_ident.html.en?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_ident.html.en (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_ident.html.en Mon Apr  7 09:28:58 2008
@@ -96,6 +96,6 @@
 <p><span>Available Languages: </span><a href="../en/mod/mod_ident.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/mod/mod_ident.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_ident.html.ko.euc-kr
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_ident.html.ko.euc-kr?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_ident.html.ko.euc-kr [euc-kr] (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_ident.html.ko.euc-kr [euc-kr] Mon Apr  7 09:28:58 2008
@@ -93,6 +93,6 @@
 <p><span>가능한 언어: </span><a href="../en/mod/mod_ident.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/mod/mod_ident.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">모듈</a> | <a href="../mod/directives.html">지시어들</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">용어</a> | <a href="../sitemap.html">사이트맵</a></p></div>
 </body></html>

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_imagemap.html.en
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_imagemap.html.en?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_imagemap.html.en (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_imagemap.html.en Mon Apr  7 09:28:58 2008
@@ -377,6 +377,6 @@
 <p><span>Available Languages: </span><a href="../en/mod/mod_imagemap.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/mod/mod_imagemap.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_imagemap.html.ko.euc-kr
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_imagemap.html.ko.euc-kr?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_imagemap.html.ko.euc-kr [euc-kr] (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_imagemap.html.ko.euc-kr [euc-kr] Mon Apr  7 09:28:58 2008
@@ -358,6 +358,6 @@
 <p><span>가능한 언어: </span><a href="../en/mod/mod_imagemap.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/mod/mod_imagemap.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">모듈</a> | <a href="../mod/directives.html">지시어들</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">용어</a> | <a href="../sitemap.html">사이트맵</a></p></div>
 </body></html>

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_include.html
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_include.html?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_include.html (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_include.html Mon Apr  7 09:28:58 2008
@@ -2,6 +2,6 @@
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_include.html.ja.euc-jp
+URI: mod_include.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_include.html.en
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_include.html.en?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_include.html.en (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_include.html.en Mon Apr  7 09:28:58 2008
@@ -643,6 +643,11 @@
       parsed expression tokenizer information, the parse tree and how it is
       evaluated into the output sent to the client.</p>
     </div>
+ 
+    <div class="note"><h3>Escaping slashes in regex strings</h3>
+     <p>All slashes which are not intended to act as delimiters in your regex must
+     be escaped.  This is regardless of their meaning to the regex engine.</p>
+    </div>
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="SSIEnableAccess" id="SSIEnableAccess">SSIEnableAccess</a> <a name="ssienableaccess" id="ssienableaccess">Directive</a></h2>
@@ -858,6 +863,6 @@
 <p><span>Available Languages: </span><a href="../en/mod/mod_include.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/mod_include.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_include.xml
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_include.xml?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_include.xml (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_include.xml Mon Apr  7 09:28:58 2008
@@ -636,6 +636,11 @@
       parsed expression tokenizer information, the parse tree and how it is
       evaluated into the output sent to the client.</p>
     </note>
+ 
+    <note><title>Escaping slashes in regex strings</title>
+     <p>All slashes which are not intended to act as delimiters in your regex must
+     be escaped.  This is regardless of their meaning to the regex engine.</p>
+    </note>
 </section>
 
 <directivesynopsis>

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_include.xml.ja
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_include.xml.ja?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_include.xml.ja [iso-2022-jp] (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_include.xml.ja [iso-2022-jp] Mon Apr  7 09:28:58 2008
@@ -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:571927 (outdated) -->
+<!-- English Revision: 151408:619736 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_info.html
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_info.html?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_info.html (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_info.html Mon Apr  7 09:28:58 2008
@@ -2,9 +2,9 @@
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_info.html.ja.euc-jp
+URI: mod_info.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_info.html.ko.euc-kr
 Content-Language: ko

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_info.html.en
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_info.html.en?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_info.html.en (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_info.html.en Mon Apr  7 09:28:58 2008
@@ -189,6 +189,6 @@
 <a href="../ja/mod/mod_info.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_info.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_info.html.ko.euc-kr
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_info.html.ko.euc-kr?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_info.html.ko.euc-kr [euc-kr] (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_info.html.ko.euc-kr [euc-kr] Mon Apr  7 09:28:58 2008
@@ -164,6 +164,6 @@
 <a href="../ja/mod/mod_info.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_info.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">모듈</a> | <a href="../mod/directives.html">지시어들</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">용어</a> | <a href="../sitemap.html">사이트맵</a></p></div>
 </body></html>

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_isapi.html.en
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_isapi.html.en?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_isapi.html.en (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_isapi.html.en Mon Apr  7 09:28:58 2008
@@ -339,6 +339,6 @@
 <p><span>Available Languages: </span><a href="../en/mod/mod_isapi.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/mod/mod_isapi.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_isapi.html.ko.euc-kr
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_isapi.html.ko.euc-kr?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_isapi.html.ko.euc-kr [euc-kr] (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_isapi.html.ko.euc-kr [euc-kr] Mon Apr  7 09:28:58 2008
@@ -314,6 +314,6 @@
 <p><span>가능한 언어: </span><a href="../en/mod/mod_isapi.html" hreflang="en" rel="alternate" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ko/mod/mod_isapi.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">모듈</a> | <a href="../mod/directives.html">지시어들</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">용어</a> | <a href="../sitemap.html">사이트맵</a></p></div>
 </body></html>

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_ldap.html.en
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_ldap.html.en?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_ldap.html.en (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_ldap.html.en Mon Apr  7 09:28:58 2008
@@ -61,6 +61,8 @@
 <li><img alt="" src="../images/down.gif" /> <a href="#ldapconnectiontimeout">LDAPConnectionTimeout</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#ldapopcacheentries">LDAPOpCacheEntries</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#ldapopcachettl">LDAPOpCacheTTL</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ldapreferralhoplimit">LDAPReferralHopLimit</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ldapreferrals">LDAPReferrals</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#ldapsharedcachefile">LDAPSharedCacheFile</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#ldapsharedcachesize">LDAPSharedCacheSize</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#ldaptrustedclientcert">LDAPTrustedClientCert</a></li>
@@ -127,6 +129,15 @@
     <p>There is no need to manually enable connection pooling in
     the Apache configuration. Any module using this module for
     access to LDAP services will share the connection pool.</p>
+
+    <p>LDAP connections can keep track of the ldap client
+    credentials used when binding to an LDAP server. These
+    credentials can be provided to LDAP servers that do not
+    allow anonymous binds during referral chasing. To control
+    this feature, see the <code class="directive"><a href="#&#10;    ldapreferrals">
+    LDAPReferrals</a></code> and <code class="directive"><a href="#&#10;    ldapreferralhoplimit">
+    LDAPReferralHopLimit</a></code> directives. By default,
+    this feature is enabled.</p>
 </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
 <h2><a name="cache" id="cache">LDAP Cache</a></h2>
@@ -176,6 +187,9 @@
       the results of comparisons done between distinguished
       names.</p>
 
+      <p>Note that, when group membership is being checked, any sub-group
+      comparison results are cached to speed future sub-group comparisons.</p>
+
       <p>The behavior of both of these caches is controlled with
       the <code class="directive"><a href="#ldapopcacheentries">LDAPOpCacheEntries</a></code>
       and <code class="directive"><a href="#ldapopcachettl">LDAPOpCacheTTL</a></code>
@@ -480,6 +494,42 @@
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LDAPReferralHopLimit" id="LDAPReferralHopLimit">LDAPReferralHopLimit</a> <a name="ldapreferralhoplimit" id="ldapreferralhoplimit">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>The maximum number of referral hops to chase before terminating an LDAP query.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LDAPReferralHopLimit <var>number</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LDAPReferralHopLimit 5</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_ldap</td></tr>
+</table>
+    <p>This directive, if enabled by the <code>LDAPReferrals</code> directive,
+    limits the number of referral hops that are followed before terminating an
+    LDAP query.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="LDAPReferrals" id="LDAPReferrals">LDAPReferrals</a> <a name="ldapreferrals" id="ldapreferrals">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Enable referral chasing during queries to the LDAP server.</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>LDAPReferrals <var>On|Off</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>LDAPReferrals On</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>AuthConfig</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_ldap</td></tr>
+</table>
+    <p>Some LDAP servers divide their directory among multiple domains and use referrals
+    to direct a client when a domain boundary is crossed. By setting <code>LDAPReferrals On</code>
+    referrals will be chased (setting it to off causes referrals to be ignored). The directive
+    <code>LDAPReferralHopLimit</code> works in conjunction with this directive to limit the
+    number of referral hops to follow before terminating the LDAP query. When referral processing
+    is enabled client credentials will be provided, via a rebind callback, for any LDAP server
+    requiring them. </p> 
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="LDAPSharedCacheFile" id="LDAPSharedCacheFile">LDAPSharedCacheFile</a> <a name="ldapsharedcachefile" id="ldapsharedcachefile">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Sets the shared memory cache file</td></tr>
@@ -622,6 +672,6 @@
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/mod/mod_ldap.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_ldap.xml
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_ldap.xml?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_ldap.xml (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_ldap.xml Mon Apr  7 09:28:58 2008
@@ -104,6 +104,15 @@
     <p>There is no need to manually enable connection pooling in
     the Apache configuration. Any module using this module for
     access to LDAP services will share the connection pool.</p>
+
+    <p>LDAP connections can keep track of the ldap client
+    credentials used when binding to an LDAP server. These
+    credentials can be provided to LDAP servers that do not
+    allow anonymous binds during referral chasing. To control
+    this feature, see the <directive module="mod_ldap">
+    LDAPReferrals</directive> and <directive module="mod_ldap">
+    LDAPReferralHopLimit</directive> directives. By default,
+    this feature is enabled.</p>
 </section>
 
 <section id="cache"><title>LDAP Cache</title>
@@ -155,6 +164,9 @@
       the results of comparisons done between distinguished
       names.</p>
 
+      <p>Note that, when group membership is being checked, any sub-group
+      comparison results are cached to speed future sub-group comparisons.</p>
+
       <p>The behavior of both of these caches is controlled with
       the <directive module="mod_ldap">LDAPOpCacheEntries</directive>
       and <directive module="mod_ldap">LDAPOpCacheTTL</directive>
@@ -463,6 +475,40 @@
 <usage>
     <p>Specifies the time (in seconds) that entries in the
     operation cache remain valid. The default is 600 seconds.</p>
+</usage>
+</directivesynopsis>
+
+<directivesynopsis>
+<name>LDAPReferralHopLimit</name>
+<description>The maximum number of referral hops to chase before terminating an LDAP query.</description>
+<syntax>LDAPReferralHopLimit <var>number</var></syntax>
+<default>LDAPReferralHopLimit 5</default>
+<contextlist><context>directory</context><context>.htaccess</context></contextlist>
+<override>AuthConfig</override>
+
+<usage>
+    <p>This directive, if enabled by the <code>LDAPReferrals</code> directive,
+    limits the number of referral hops that are followed before terminating an
+    LDAP query.</p>
+</usage>
+</directivesynopsis>
+
+<directivesynopsis>
+<name>LDAPReferrals</name>
+<description>Enable referral chasing during queries to the LDAP server.</description>
+<syntax>LDAPReferrals <var>On|Off</var></syntax>
+<default>LDAPReferrals On</default>
+<contextlist><context>directory</context><context>.htaccess</context></contextlist>
+<override>AuthConfig</override>
+
+<usage>
+    <p>Some LDAP servers divide their directory among multiple domains and use referrals
+    to direct a client when a domain boundary is crossed. By setting <code>LDAPReferrals On</code>
+    referrals will be chased (setting it to off causes referrals to be ignored). The directive
+    <code>LDAPReferralHopLimit</code> works in conjunction with this directive to limit the
+    number of referral hops to follow before terminating the LDAP query. When referral processing
+    is enabled client credentials will be provided, via a rebind callback, for any LDAP server
+    requiring them. </p> 
 </usage>
 </directivesynopsis>
 

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_log_config.html
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_log_config.html?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_log_config.html (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_log_config.html Mon Apr  7 09:28:58 2008
@@ -2,9 +2,9 @@
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_log_config.html.ja.euc-jp
+URI: mod_log_config.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_log_config.html.ko.euc-kr
 Content-Language: ko

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_log_config.html.en
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_log_config.html.en?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_log_config.html.en (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_log_config.html.en Mon Apr  7 09:28:58 2008
@@ -472,6 +472,6 @@
 <a href="../ja/mod/mod_log_config.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_log_config.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_log_config.html.ko.euc-kr
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_log_config.html.ko.euc-kr?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_log_config.html.ko.euc-kr [euc-kr] (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_log_config.html.ko.euc-kr [euc-kr] Mon Apr  7 09:28:58 2008
@@ -396,6 +396,6 @@
 <a href="../ja/mod/mod_log_config.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_log_config.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">모듈</a> | <a href="../mod/directives.html">지시어들</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">용어</a> | <a href="../sitemap.html">사이트맵</a></p></div>
 </body></html>

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_log_forensic.html
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_log_forensic.html?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_log_forensic.html (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_log_forensic.html Mon Apr  7 09:28:58 2008
@@ -2,6 +2,6 @@
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_log_forensic.html.ja.euc-jp
+URI: mod_log_forensic.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_log_forensic.html.en
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_log_forensic.html.en?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_log_forensic.html.en (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_log_forensic.html.en Mon Apr  7 09:28:58 2008
@@ -157,6 +157,6 @@
 <p><span>Available Languages: </span><a href="../en/mod/mod_log_forensic.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/mod_log_forensic.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_logio.html
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_logio.html?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_logio.html (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_logio.html Mon Apr  7 09:28:58 2008
@@ -2,9 +2,9 @@
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_logio.html.ja.euc-jp
+URI: mod_logio.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_logio.html.ko.euc-kr
 Content-Language: ko

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_logio.html.en
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_logio.html.en?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_logio.html.en (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_logio.html.en Mon Apr  7 09:28:58 2008
@@ -41,6 +41,11 @@
 
     <p>This module requires <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code>.</p>
 
+    <div class="note">When KeepAlive connections are used with SSL, the overhead of the SSL
+    handshake is reflected in the byte count of the first request on the
+    connection.  When per-directory SSL renegotiation occurs, the bytes are associated
+    with the request that triggered the renegotiation.</div>
+
 </div>
 <div id="quickview"><h3 class="directives">Directives</h3>
 <p>This module provides no
@@ -86,6 +91,6 @@
 <a href="../ja/mod/mod_logio.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_logio.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_logio.html.ko.euc-kr
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_logio.html.ko.euc-kr?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_logio.html.ko.euc-kr [euc-kr] (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_logio.html.ko.euc-kr [euc-kr] Mon Apr  7 09:28:58 2008
@@ -25,6 +25,8 @@
 <a href="../ja/mod/mod_logio.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_logio.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div>
+<div class="outofdate">이 문서는 최신판 번역이 아닙니다.
+            최근에 변경된 내용은 영어 문서를 참고하세요.</div>
 <table class="module"><tr><th><a href="module-dict.html#Description">설명:</a></th><td>요청당 입출력 바이트수를 기록</td></tr>
 <tr><th><a href="module-dict.html#Status">상태:</a></th><td>Extension</td></tr>
 <tr><th><a href="module-dict.html#ModuleIdentifier">모듈명:</a></th><td>logio_module</td></tr>
@@ -87,6 +89,6 @@
 <a href="../ja/mod/mod_logio.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_logio.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">모듈</a> | <a href="../mod/directives.html">지시어들</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">용어</a> | <a href="../sitemap.html">사이트맵</a></p></div>
 </body></html>

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_logio.xml
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_logio.xml?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_logio.xml (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_logio.xml Mon Apr  7 09:28:58 2008
@@ -39,6 +39,11 @@
 
     <p>This module requires <module>mod_log_config</module>.</p>
 
+    <note>When KeepAlive connections are used with SSL, the overhead of the SSL
+    handshake is reflected in the byte count of the first request on the
+    connection.  When per-directory SSL renegotiation occurs, the bytes are associated
+    with the request that triggered the renegotiation.</note>
+
 </summary>
 
 <seealso><module>mod_log_config</module></seealso>

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_logio.xml.ja
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_logio.xml.ja?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_logio.xml.ja [iso-2022-jp] (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_logio.xml.ja [iso-2022-jp] Mon Apr  7 09:28:58 2008
@@ -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: 420990 -->
+<!-- English Revision: 420990:630289 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_logio.xml.ko
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_logio.xml.ko?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_logio.xml.ko [euc-kr] (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_logio.xml.ko [euc-kr] Mon Apr  7 09:28:58 2008
@@ -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: 420990 -->
+<!-- English Revision: 420990:630289 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_logio.xml.meta
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_logio.xml.meta?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_logio.xml.meta (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_logio.xml.meta Mon Apr  7 09:28:58 2008
@@ -7,7 +7,7 @@
 
   <variants>
     <variant>en</variant>
-    <variant>ja</variant>
-    <variant>ko</variant>
+    <variant outdated="yes">ja</variant>
+    <variant outdated="yes">ko</variant>
   </variants>
 </metafile>

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_mem_cache.html
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_mem_cache.html?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_mem_cache.html (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_mem_cache.html Mon Apr  7 09:28:58 2008
@@ -2,9 +2,9 @@
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_mem_cache.html.ja.euc-jp
+URI: mod_mem_cache.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8
 
 URI: mod_mem_cache.html.ko.euc-kr
 Content-Language: ko

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_mem_cache.html.en
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_mem_cache.html.en?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_mem_cache.html.en (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_mem_cache.html.en Mon Apr  7 09:28:58 2008
@@ -234,6 +234,6 @@
 <a href="../ja/mod/mod_mem_cache.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_mem_cache.html" hreflang="ko" rel="alternate" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_mem_cache.html.ko.euc-kr
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_mem_cache.html.ko.euc-kr?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_mem_cache.html.ko.euc-kr [euc-kr] (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_mem_cache.html.ko.euc-kr [euc-kr] Mon Apr  7 09:28:58 2008
@@ -232,6 +232,6 @@
 <a href="../ja/mod/mod_mem_cache.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a> |
 <a href="../ko/mod/mod_mem_cache.html" title="Korean">&nbsp;ko&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">모듈</a> | <a href="../mod/directives.html">지시어들</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">용어</a> | <a href="../sitemap.html">사이트맵</a></p></div>
 </body></html>

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_mime.html
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_mime.html?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_mime.html (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_mime.html Mon Apr  7 09:28:58 2008
@@ -2,6 +2,6 @@
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_mime.html.ja.euc-jp
+URI: mod_mime.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_mime.html.en
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_mime.html.en?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_mime.html.en (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_mime.html.en Mon Apr  7 09:28:58 2008
@@ -980,6 +980,6 @@
 <p><span>Available Languages: </span><a href="../en/mod/mod_mime.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/mod_mime.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_mime.xml.ja
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_mime.xml.ja?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_mime.xml.ja [iso-2022-jp] (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_mime.xml.ja [iso-2022-jp] Mon Apr  7 09:28:58 2008
@@ -26,7 +26,7 @@
 <description>リクエストされたファイルの拡張子とファイルの振る舞い
     (ハンドラとフィルタ)、内容 (MIME タイプ、言語、文字セット、エンコーディング)
     とを関連付ける</description>
-<status>ベース</status>
+<status>Base</status>
 <sourcefile>mod_mime.c</sourcefile>
 <identifier>mime_module</identifier>
 

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_mime_magic.html.en
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_mime_magic.html.en?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_mime_magic.html.en (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_mime_magic.html.en Mon Apr  7 09:28:58 2008
@@ -270,6 +270,6 @@
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/mod/mod_mime_magic.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_negotiation.html
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_negotiation.html?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_negotiation.html (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_negotiation.html Mon Apr  7 09:28:58 2008
@@ -2,6 +2,6 @@
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_negotiation.html.ja.euc-jp
+URI: mod_negotiation.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_negotiation.html.en
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_negotiation.html.en?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_negotiation.html.en (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_negotiation.html.en Mon Apr  7 09:28:58 2008
@@ -302,6 +302,6 @@
 <p><span>Available Languages: </span><a href="../en/mod/mod_negotiation.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/mod_negotiation.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_nw_ssl.html.en
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_nw_ssl.html.en?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_nw_ssl.html.en (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_nw_ssl.html.en Mon Apr  7 09:28:58 2008
@@ -92,6 +92,6 @@
 <div class="bottomlang">
 <p><span>Available Languages: </span><a href="../en/mod/mod_nw_ssl.html" title="English">&nbsp;en&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_proxy.html
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_proxy.html?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_proxy.html (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_proxy.html Mon Apr  7 09:28:58 2008
@@ -2,6 +2,6 @@
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_proxy.html.ja.euc-jp
+URI: mod_proxy.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_proxy.html.en
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_proxy.html.en?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_proxy.html.en (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_proxy.html.en Mon Apr  7 09:28:58 2008
@@ -70,6 +70,7 @@
 <li><img alt="" src="../images/down.gif" /> <a href="#proxyblock">ProxyBlock</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#proxydomain">ProxyDomain</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#proxyerroroverride">ProxyErrorOverride</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#proxyftpdircharset">ProxyFtpDirCharset</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#proxyiobuffersize">ProxyIOBufferSize</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#proxymatch">&lt;ProxyMatch&gt;</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#proxymaxforwards">ProxyMaxForwards</a></li>
@@ -91,13 +92,14 @@
 </ul>
 <h3>Topics</h3>
 <ul id="topics">
-<li><img alt="" src="../images/down.gif" /> <a href="#forwardreverse">Forward and Reverse Proxies</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#forwardreverse">Forward Proxies and Reverse 
+       Proxies/Gateways</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#examples">Basic Examples</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#access">Controlling access to your proxy</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#startup">Slow Startup</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#intranet">Intranet Proxy</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#envsettings">Protocol Adjustments</a></li>
-<li><img alt="" src="../images/down.gif" /> <a href="#request-bodies">Request Bodys</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#request-bodies">Request Bodies</a></li>
 <li><img alt="" src="../images/down.gif" /> <a href="#x-headers">Reverse Proxy Request Headers</a></li>
 </ul><h3>See also</h3>
 <ul class="seealso">
@@ -110,9 +112,10 @@
 </ul></div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
-<h2><a name="forwardreverse" id="forwardreverse">Forward and Reverse Proxies</a></h2>
+<h2><a name="forwardreverse" id="forwardreverse">Forward Proxies and Reverse 
+       Proxies/Gateways</a></h2>
       <p>Apache can be configured in both a <dfn>forward</dfn> and
-      <dfn>reverse</dfn> proxy mode.</p>
+      <dfn>reverse</dfn> proxy (also known as <dfn>gateway</dfn>) mode.</p>
 
       <p>An ordinary <dfn>forward proxy</dfn> is an intermediate
       server that sits between the client and the <em>origin
@@ -135,13 +138,13 @@
       authorized clients can access the proxy before activating a
       forward proxy.</p>
 
-      <p>A <dfn>reverse proxy</dfn>, by contrast, appears to the
-      client just like an ordinary web server.  No special
-      configuration on the client is necessary.  The client makes
-      ordinary requests for content in the name-space of the reverse
-      proxy.  The reverse proxy then decides where to send those
-      requests, and returns the content as if it was itself the
-      origin.</p>
+      <p>A <dfn>reverse proxy</dfn> (or <dfn>gateway</dfn>), by
+      contrast, appears to the client just like an ordinary web
+      server.  No special configuration on the client is necessary.
+      The client makes ordinary requests for content in the name-space
+      of the reverse proxy.  The reverse proxy then decides where to
+      send those requests, and returns the content as if it was itself
+      the origin.</p>
 
       <p>A typical usage of a reverse proxy is to provide Internet
       users access to a server that is behind a firewall.  Reverse
@@ -274,7 +277,7 @@
 
     </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="section">
-<h2><a name="request-bodies" id="request-bodies">Request Bodys</a></h2>
+<h2><a name="request-bodies" id="request-bodies">Request Bodies</a></h2>
 
     <p>Some request methods such as POST include a request body.
     The HTTP protocol requires that requests which include a body
@@ -652,6 +655,22 @@
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="ProxyFtpDirCharset" id="ProxyFtpDirCharset">ProxyFtpDirCharset</a> <a name="proxyftpdircharset" id="proxyftpdircharset">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Define the character set for proxied FTP listings</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>ProxyFtpDirCharset <var>character set</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>ProxyFtpDirCharset ISO-8859-1</code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</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_proxy</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.2.7 and later</td></tr>
+</table>
+    <p>The <code class="directive">ProxyFtpDirCharset</code> directive defines the
+    character set to be set for FTP directory listings in HTML generated by
+    <code class="module"><a href="../mod/mod_proxy_ftp.html">mod_proxy_ftp</a></code>.</p>
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="ProxyIOBufferSize" id="ProxyIOBufferSize">ProxyIOBufferSize</a> <a name="proxyiobuffersize" id="proxyiobuffersize">Directive</a></h2>
 <table class="directive">
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Determine size of internal data throughput buffer</td></tr>
@@ -663,9 +682,18 @@
 </table>
     <p>The <code class="directive">ProxyIOBufferSize</code> directive adjusts the size
     of the internal buffer, which is used as a scratchpad for the data between
-    input and output. The size must be less or equal <code>8192</code>.</p>
+    input and output. The size must be less or equal <code>65536</code>.</p>
 
     <p>In almost every case there's no reason to change that value.</p>
+    <p>If used with AJP this directive sets the maximum AJP packet size in
+    bytes. If you change it from the default, you must also change the 
+    <code>packetSize</code> attribute of your AJP connector on the
+    Tomcat side! The attribute <code>packetSize</code> is only available
+    in Tomcat <code>5.5.20+</code> and <code>6.0.2+</code></p>
+    <p>Normally it is not necessary to change the maximum packet size.
+    Problems with the default value have been reported when sending
+    certificates or certificate chains.</p>
+    
 
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -724,12 +752,13 @@
 <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_proxy</td></tr>
 </table>
-    <p>This directive allows remote servers to be mapped into the space of
-    the local server; the local server does not act as a proxy in the
-    conventional sense, but appears to be a mirror of the remote
-    server. <var>path</var> is the name of a local virtual path; <var>url</var>
-    is a partial URL for the remote server and cannot include a query
-    string.</p>
+    <p>This directive allows remote servers to be mapped into the
+    space of the local server; the local server does not act as a
+    proxy in the conventional sense, but appears to be a mirror of the
+    remote server. The local server is often called a <dfn>reverse
+    proxy</dfn> or <dfn>gateway</dfn>. The <var>path</var> is the name of
+    a local virtual path; <var>url</var> is a partial URL for the
+    remote server and cannot include a query string.</p>
 
     <div class="warning">The <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> directive should
     usually be set <strong>off</strong> when using
@@ -767,7 +796,7 @@
     <code>/mirror/foo/i</code>.</p>
 
     <div class="note"><h3>Note</h3>
-      <p>Order is important. you need to put the exclusions <em>before</em> the
+      <p>Order is important: exclusions must come <em>before</em> the
       general <code class="directive">ProxyPass</code> directive.</p>
     </div>
 
@@ -820,6 +849,16 @@
     in the pool the Apache will return <code>SERVER_BUSY</code> status to
     the client.
     </td></tr>
+    <tr><td>disablereuse</td>
+        <td>Off</td>
+        <td>This parameter should be used when you want to force mod_proxy
+    to immediately close a connection to the backend after being used, and
+    thus, disable its persistent connection and pool for that backend.
+    This helps in various situations where a firewall between Apache and
+    the backend server (regardless of protocol) tends to silently
+    drop connections. To disable connection pooling reuse,
+    set this property value to <code>On</code>. 
+    </td></tr>
     <tr><td>flushpackets</td>
         <td>off</td>
         <td>Determines whether the proxy module will auto-flush the output
@@ -1080,10 +1119,11 @@
 <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy</td></tr>
 </table>
     <p>This directive lets Apache adjust the URL in the <code>Location</code>,
-    <code>Content-Location</code> and <code>URI</code> headers on HTTP redirect
-    responses. This is essential when Apache is used as a reverse proxy to avoid
-    by-passing the reverse proxy because of HTTP redirects on the backend
-    servers which stay behind the reverse proxy.</p>
+    <code>Content-Location</code> and <code>URI</code> headers on HTTP
+    redirect responses. This is essential when Apache is used as a
+    reverse proxy (or gateway) to avoid by-passing the reverse proxy
+    because of HTTP redirects on the backend servers which stay behind
+    the reverse proxy.</p>
 
     <p>Only the HTTP response headers specifically mentioned above
     will be rewritten.  Apache will not rewrite other response
@@ -1279,7 +1319,8 @@
     server. (Setting ProxyRequests to <code>Off</code> does not disable use of
     the <code class="directive"><a href="#proxypass">ProxyPass</a></code> directive.)</p>
 
-    <p>In a typical reverse proxy configuration, this option should be set to
+    <p>In a typical reverse proxy or gateway configuration, this
+    option should be set to
     <code>Off</code>.</p>
 
     <p>In order to get the functionality of proxying HTTP or FTP sites, you
@@ -1291,6 +1332,10 @@
       both to your network and to the Internet at large.</p>
     </div>
 
+<h3>See also</h3>
+<ul>
+<li><a href="#forwardreverse">Forward and Reverse Proxies/Gateways</a></li>
+</ul>
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="ProxySet" id="ProxySet">ProxySet</a> <a name="proxyset" id="proxyset">Directive</a></h2>
@@ -1423,6 +1468,6 @@
 <p><span>Available Languages: </span><a href="../en/mod/mod_proxy.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/mod_proxy.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_proxy.xml
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_proxy.xml?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_proxy.xml (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_proxy.xml Mon Apr  7 09:28:58 2008
@@ -68,9 +68,10 @@
 <seealso><module>mod_proxy_balancer</module></seealso>
 <seealso><module>mod_ssl</module></seealso>
 
-    <section id="forwardreverse"><title>Forward and Reverse Proxies</title>
+    <section id="forwardreverse"><title>Forward Proxies and Reverse 
+       Proxies/Gateways</title>
       <p>Apache can be configured in both a <dfn>forward</dfn> and
-      <dfn>reverse</dfn> proxy mode.</p>
+      <dfn>reverse</dfn> proxy (also known as <dfn>gateway</dfn>) mode.</p>
 
       <p>An ordinary <dfn>forward proxy</dfn> is an intermediate
       server that sits between the client and the <em>origin
@@ -94,13 +95,13 @@
       authorized clients can access the proxy before activating a
       forward proxy.</p>
 
-      <p>A <dfn>reverse proxy</dfn>, by contrast, appears to the
-      client just like an ordinary web server.  No special
-      configuration on the client is necessary.  The client makes
-      ordinary requests for content in the name-space of the reverse
-      proxy.  The reverse proxy then decides where to send those
-      requests, and returns the content as if it was itself the
-      origin.</p>
+      <p>A <dfn>reverse proxy</dfn> (or <dfn>gateway</dfn>), by
+      contrast, appears to the client just like an ordinary web
+      server.  No special configuration on the client is necessary.
+      The client makes ordinary requests for content in the name-space
+      of the reverse proxy.  The reverse proxy then decides where to
+      send those requests, and returns the content as if it was itself
+      the origin.</p>
 
       <p>A typical usage of a reverse proxy is to provide Internet
       users access to a server that is behind a firewall.  Reverse
@@ -245,7 +246,7 @@
 
     </section> <!-- /envsettings -->
 
-    <section id="request-bodies"><title>Request Bodys</title>
+    <section id="request-bodies"><title>Request Bodies</title>
 
     <p>Some request methods such as POST include a request body.
     The HTTP protocol requires that requests which include a body
@@ -372,6 +373,22 @@
 </usage>
 </directivesynopsis>
 
+<directivesynopsis>
+<name>ProxyFtpDirCharset</name>
+<description>Define the character set for proxied FTP listings</description>
+<syntax>ProxyFtpDirCharset <var>character set</var></syntax>
+<default>ProxyFtpDirCharset ISO-8859-1</default>
+<contextlist><context>server config</context><context>virtual host</context>
+<context>directory</context></contextlist>
+<compatibility>Available in Apache 2.2.7 and later</compatibility>
+
+<usage>
+    <p>The <directive>ProxyFtpDirCharset</directive> directive defines the
+    character set to be set for FTP directory listings in HTML generated by
+    <module>mod_proxy_ftp</module>.</p>
+</usage>
+</directivesynopsis>
+
 <directivesynopsis type="section">
 <name>ProxyMatch</name>
 <description>Container for directives applied to regular-expression-matched 
@@ -423,7 +440,8 @@
     server. (Setting ProxyRequests to <code>Off</code> does not disable use of
     the <directive module="mod_proxy">ProxyPass</directive> directive.)</p>
 
-    <p>In a typical reverse proxy configuration, this option should be set to
+    <p>In a typical reverse proxy or gateway configuration, this
+    option should be set to
     <code>Off</code>.</p>
 
     <p>In order to get the functionality of proxying HTTP or FTP sites, you
@@ -437,6 +455,7 @@
       both to your network and to the Internet at large.</p>
     </note>
 </usage>
+<seealso><a href="#forwardreverse">Forward and Reverse Proxies/Gateways</a></seealso>
 </directivesynopsis>
 
 <directivesynopsis>
@@ -580,12 +599,13 @@
 </contextlist>
 
 <usage>
-    <p>This directive allows remote servers to be mapped into the space of
-    the local server; the local server does not act as a proxy in the
-    conventional sense, but appears to be a mirror of the remote
-    server. <var>path</var> is the name of a local virtual path; <var>url</var>
-    is a partial URL for the remote server and cannot include a query
-    string.</p>
+    <p>This directive allows remote servers to be mapped into the
+    space of the local server; the local server does not act as a
+    proxy in the conventional sense, but appears to be a mirror of the
+    remote server. The local server is often called a <dfn>reverse
+    proxy</dfn> or <dfn>gateway</dfn>. The <var>path</var> is the name of
+    a local virtual path; <var>url</var> is a partial URL for the
+    remote server and cannot include a query string.</p>
 
     <note type="warning">The <directive
     module="mod_proxy">ProxyRequests</directive> directive should
@@ -624,7 +644,7 @@
     <code>/mirror/foo/i</code>.</p>
 
     <note><title>Note</title>
-      <p>Order is important. you need to put the exclusions <em>before</em> the
+      <p>Order is important: exclusions must come <em>before</em> the
       general <directive>ProxyPass</directive> directive.</p>
     </note>
 
@@ -677,6 +697,16 @@
     in the pool the Apache will return <code>SERVER_BUSY</code> status to
     the client.
     </td></tr>
+    <tr><td>disablereuse</td>
+        <td>Off</td>
+        <td>This parameter should be used when you want to force mod_proxy
+    to immediately close a connection to the backend after being used, and
+    thus, disable its persistent connection and pool for that backend.
+    This helps in various situations where a firewall between Apache and
+    the backend server (regardless of protocol) tends to silently
+    drop connections. To disable connection pooling reuse,
+    set this property value to <code>On</code>. 
+    </td></tr>
     <tr><td>flushpackets</td>
         <td>off</td>
         <td>Determines whether the proxy module will auto-flush the output
@@ -913,10 +943,11 @@
 
 <usage>
     <p>This directive lets Apache adjust the URL in the <code>Location</code>,
-    <code>Content-Location</code> and <code>URI</code> headers on HTTP redirect
-    responses. This is essential when Apache is used as a reverse proxy to avoid
-    by-passing the reverse proxy because of HTTP redirects on the backend
-    servers which stay behind the reverse proxy.</p>
+    <code>Content-Location</code> and <code>URI</code> headers on HTTP
+    redirect responses. This is essential when Apache is used as a
+    reverse proxy (or gateway) to avoid by-passing the reverse proxy
+    because of HTTP redirects on the backend servers which stay behind
+    the reverse proxy.</p>
 
     <p>Only the HTTP response headers specifically mentioned above
     will be rewritten.  Apache will not rewrite other response
@@ -1102,9 +1133,18 @@
 <usage>
     <p>The <directive>ProxyIOBufferSize</directive> directive adjusts the size
     of the internal buffer, which is used as a scratchpad for the data between
-    input and output. The size must be less or equal <code>8192</code>.</p>
+    input and output. The size must be less or equal <code>65536</code>.</p>
 
     <p>In almost every case there's no reason to change that value.</p>
+    <p>If used with AJP this directive sets the maximum AJP packet size in
+    bytes. If you change it from the default, you must also change the 
+    <code>packetSize</code> attribute of your AJP connector on the
+    Tomcat side! The attribute <code>packetSize</code> is only available
+    in Tomcat <code>5.5.20+</code> and <code>6.0.2+</code></p>
+    <p>Normally it is not necessary to change the maximum packet size.
+    Problems with the default value have been reported when sending
+    certificates or certificate chains.</p>
+    
 </usage>
 </directivesynopsis>
 

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_proxy.xml.ja
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_proxy.xml.ja?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_proxy.xml.ja [iso-2022-jp] (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_proxy.xml.ja [iso-2022-jp] Mon Apr  7 09:28:58 2008
@@ -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: 189754:589371 (outdated) -->
+<!-- English Revision: 189754:634760 (outdated) -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_proxy_ajp.html
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_proxy_ajp.html?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_proxy_ajp.html (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_proxy_ajp.html Mon Apr  7 09:28:58 2008
@@ -2,6 +2,6 @@
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_proxy_ajp.html.ja.euc-jp
+URI: mod_proxy_ajp.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_proxy_ajp.html.en
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_proxy_ajp.html.en?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_proxy_ajp.html.en (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_proxy_ajp.html.en Mon Apr  7 09:28:58 2008
@@ -552,6 +552,6 @@
 <p><span>Available Languages: </span><a href="../en/mod/mod_proxy_ajp.html" title="English">&nbsp;en&nbsp;</a> |
 <a href="../ja/mod/mod_proxy_ajp.html" hreflang="ja" rel="alternate" title="Japanese">&nbsp;ja&nbsp;</a></p>
 </div><div id="footer">
-<p class="apache">Copyright 2007 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
+<p class="apache">Copyright 2008 The Apache Software Foundation.<br />Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.</p>
 <p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div>
 </body></html>

Modified: httpd/sandbox/amsterdam/d/docs/manual/mod/mod_proxy_balancer.html
URL: http://svn.apache.org/viewvc/httpd/sandbox/amsterdam/d/docs/manual/mod/mod_proxy_balancer.html?rev=645594&r1=645593&r2=645594&view=diff
==============================================================================
--- httpd/sandbox/amsterdam/d/docs/manual/mod/mod_proxy_balancer.html (original)
+++ httpd/sandbox/amsterdam/d/docs/manual/mod/mod_proxy_balancer.html Mon Apr  7 09:28:58 2008
@@ -2,6 +2,6 @@
 Content-Language: en
 Content-type: text/html; charset=ISO-8859-1
 
-URI: mod_proxy_balancer.html.ja.euc-jp
+URI: mod_proxy_balancer.html.ja.utf8
 Content-Language: ja
-Content-type: text/html; charset=EUC-JP
+Content-type: text/html; charset=UTF-8