You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2011/12/01 13:56:21 UTC
svn commit: r1209061 [1/2] - in /httpd/httpd/trunk/docs/manual: ./ mod/
Author: minfrin
Date: Thu Dec 1 12:56:15 2011
New Revision: 1209061
URL: http://svn.apache.org/viewvc?rev=1209061&view=rev
Log:
Update transformations.
Modified:
httpd/httpd/trunk/docs/manual/expr.html.en
httpd/httpd/trunk/docs/manual/mod/core.html.en
httpd/httpd/trunk/docs/manual/mod/core.xml.de
httpd/httpd/trunk/docs/manual/mod/core.xml.ja
httpd/httpd/trunk/docs/manual/mod/core.xml.tr
httpd/httpd/trunk/docs/manual/mod/directives.html.en
httpd/httpd/trunk/docs/manual/mod/index.html.en
httpd/httpd/trunk/docs/manual/mod/mod_autoindex.html.en
httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.ja
httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.ko
httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.tr
httpd/httpd/trunk/docs/manual/mod/mod_log_config.html.en
httpd/httpd/trunk/docs/manual/mod/mod_log_config.xml.ja
httpd/httpd/trunk/docs/manual/mod/mod_log_config.xml.ko
httpd/httpd/trunk/docs/manual/mod/mod_log_config.xml.tr
httpd/httpd/trunk/docs/manual/mod/mod_remoteip.html.en
httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en
httpd/httpd/trunk/docs/manual/mod/mod_session_crypto.html.en
httpd/httpd/trunk/docs/manual/mod/quickreference.html.en
Modified: httpd/httpd/trunk/docs/manual/expr.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/expr.html.en?rev=1209061&r1=1209060&r2=1209061&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/expr.html.en (original)
+++ httpd/httpd/trunk/docs/manual/expr.html.en Thu Dec 1 12:56:15 2011
@@ -224,7 +224,7 @@ listfunction ::= listfuncname "<strong>(
<td>The error log id of the connection (see
<code class="directive"><a href="./mod/core.html#errorlogformat">ErrorLogFormat</a></code>)</td></tr>
<tr><td><code>CONN_REMOTE_ADDR</code></td>
- <td>The raw IP address of the remote host (see the
+ <td>The peer IP address of the connection (see the
<code class="module"><a href="./mod/mod_remoteip.html">mod_remoteip</a></code> module)</td></tr>
</table>
Modified: httpd/httpd/trunk/docs/manual/mod/core.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.html.en?rev=1209061&r1=1209060&r2=1209061&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.html.en Thu Dec 1 12:56:15 2011
@@ -1423,9 +1423,9 @@ in case of an error</td></tr>
<tr><td><code>%%</code></td>
<td>The percent sign</td></tr>
<tr class="odd"><td><code>%a</code></td>
- <td>Remote IP-address and port</td></tr>
+ <td>Client IP address and port of the request</td></tr>
<tr><td><code>%{c}a</code></td>
- <td>Actual remote IP-address and port (see the
+ <td>Underlying peer IP address and port of the connection (see the
<code class="module"><a href="../mod/mod_remoteip.html">mod_remoteip</a></code> module)</td></tr>
<tr class="odd"><td><code>%A</code></td>
<td>Local IP-address and port</td></tr>
Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.de
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml.de?rev=1209061&r1=1209060&r2=1209061&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.de (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.de Thu Dec 1 12:56:15 2011
@@ -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: 344972:1205075 (outdated) -->
+<!-- English Revision: 344972:1208753 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml.ja?rev=1209061&r1=1209060&r2=1209061&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.ja [utf-8] Thu Dec 1 12:56:15 2011
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 669847:1205075 (outdated) -->
+<!-- English Revision: 669847:1208753 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml.tr?rev=1209061&r1=1209060&r2=1209061&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.tr [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.tr [utf-8] Thu Dec 1 12:56:15 2011
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 813376:1205075 (outdated) -->
+<!-- English Revision: 813376:1208753 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
Modified: httpd/httpd/trunk/docs/manual/mod/directives.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/directives.html.en?rev=1209061&r1=1209060&r2=1209061&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/directives.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/directives.html.en Thu Dec 1 12:56:15 2011
@@ -482,6 +482,7 @@
<li><a href="mod_session_crypto.html#sessioncryptocipher">SessionCryptoCipher</a></li>
<li><a href="mod_session_crypto.html#sessioncryptodriver">SessionCryptoDriver</a></li>
<li><a href="mod_session_crypto.html#sessioncryptopassphrase">SessionCryptoPassphrase</a></li>
+<li><a href="mod_session_crypto.html#sessioncryptopassphrasefile">SessionCryptoPassphraseFile</a></li>
<li><a href="mod_session_dbd.html#sessiondbdcookiename">SessionDBDCookieName</a></li>
<li><a href="mod_session_dbd.html#sessiondbdcookiename2">SessionDBDCookieName2</a></li>
<li><a href="mod_session_dbd.html#sessiondbdcookieremove">SessionDBDCookieRemove</a></li>
Modified: httpd/httpd/trunk/docs/manual/mod/index.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/index.html.en?rev=1209061&r1=1209060&r2=1209061&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/index.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/index.html.en Thu Dec 1 12:56:15 2011
@@ -185,9 +185,9 @@ from Clients' networks in a proxy contex
<dt><a href="mod_proxy_scgi.html">mod_proxy_scgi</a></dt><dd>SCGI gateway module for <code class="module"><a href="../mod/mod_proxy.html">mod_proxy</a></code></dd>
<dt><a href="mod_ratelimit.html" id="R" name="R">mod_ratelimit</a></dt><dd>Bandwidth Rate Limiting for Clients</dd>
<dt><a href="mod_reflector.html">mod_reflector</a></dt><dd>Reflect a request body as a response via the output filter stack.</dd>
-<dt><a href="mod_remoteip.html">mod_remoteip</a></dt><dd>Replaces the apparent client remote IP address for the request
-with the IP address list presented by a proxies or a load balancer via the
-request headers.
+<dt><a href="mod_remoteip.html">mod_remoteip</a></dt><dd>Replaces the original peer IP address for the connection
+with the client IP address list presented by a proxies or a load balancer
+via the request headers.
</dd>
<dt><a href="mod_reqtimeout.html">mod_reqtimeout</a></dt><dd>Set timeout and minimum data rate for receiving requests
</dd>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_autoindex.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_autoindex.html.en?rev=1209061&r1=1209060&r2=1209061&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_autoindex.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_autoindex.html.en Thu Dec 1 12:56:15 2011
@@ -294,7 +294,8 @@ icon selected by MIME content-type</td><
<var>String</var> is enclosed in double quotes (<code>"</code>).</p>
<div class="example"><h3>Example</h3><p><code>
- AddDescription "The planet Mars" /web/pics/mars.gif
+ AddDescription "The planet Mars" mars.gif <br />
+ AddDescription "My friend Marshall" friends/mars.gif
</code></p></div>
<p>The typical, default description field is 23 bytes wide. 6
@@ -324,6 +325,14 @@ icon selected by MIME content-type</td><
results may affect the rest of the directory listing.</p>
</div>
+ <div class="note"><h3>Arguments with path information</h3>
+ <p>Absolute paths are not currently supported and do not match
+ anything at runtime. Arguments with relative path information,
+ which would normally only be used in htaccess context, are implicitly
+ prefixed with '*/' to avoid matching partial directory names.</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="AddIcon" id="AddIcon">AddIcon</a> <a name="addicon" id="addicon">Directive</a></h2>
@@ -538,6 +547,12 @@ a directory</td></tr>
IndexIgnore .??* *~ *# HEADER* README* RCS CVS *,v *,t
</code></p></div>
+ <div class="note"><h3>Regular Expressions</h3>
+ <p>This directive does not currently work in configuration sections
+ that have regular expression arguments, such as <code class="directive"><a href="../mod/core.html#directorymatch"><DirectoryMatch></a></code>
+ </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="IndexIgnoreReset" id="IndexIgnoreReset">IndexIgnoreReset</a> <a name="indexignorereset" id="indexignorereset">Directive</a></h2>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.ja?rev=1209061&r1=1209060&r2=1209061&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.ja [utf-8] Thu Dec 1 12:56:15 2011
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 689261:1204356 (outdated) -->
+<!-- English Revision: 689261:1206682 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.ko?rev=1209061&r1=1209060&r2=1209061&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.ko [euc-kr] Thu Dec 1 12:56:15 2011
@@ -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: 103423:1204356 (outdated) -->
+<!-- English Revision: 103423:1206682 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.tr?rev=1209061&r1=1209060&r2=1209061&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.tr [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_autoindex.xml.tr [utf-8] Thu Dec 1 12:56:15 2011
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 807930:1204356 (outdated) -->
+<!-- English Revision: 807930:1206682 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_log_config.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_log_config.html.en?rev=1209061&r1=1209060&r2=1209061&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_log_config.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_log_config.html.en Thu Dec 1 12:56:15 2011
@@ -81,10 +81,10 @@
<tr><td><code>%%</code></td>
<td>The percent sign.</td></tr>
<tr class="odd"><td><code>%a</code></td>
- <td>Remote IP-address.</td></tr>
+ <td>Client IP address and port of the request.</td></tr>
<tr><td><code>%{c}a</code></td>
- <td>Actual remote IP-address and port (see the
- <code class="module"><a href="../mod/mod_remoteip.html">mod_remoteip</a></code> module)</td></tr>
+ <td>Underlying peer IP address and port of the connection (see the
+ <code class="module"><a href="../mod/mod_remoteip.html">mod_remoteip</a></code> module).</td></tr>
<tr class="odd"><td><code>%A</code></td>
<td>Local IP-address.</td></tr>
<tr><td><code>%B</code></td>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_log_config.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_log_config.xml.ja?rev=1209061&r1=1209060&r2=1209061&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_log_config.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_log_config.xml.ja [utf-8] Thu Dec 1 12:56:15 2011
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?>
-<!-- English Revision: 579425:1205075 (outdated) -->
+<!-- English Revision: 579425:1208753 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/mod/mod_log_config.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_log_config.xml.ko?rev=1209061&r1=1209060&r2=1209061&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_log_config.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_log_config.xml.ko [euc-kr] Thu Dec 1 12:56:15 2011
@@ -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: 105989:1205075 (outdated) -->
+<!-- English Revision: 105989:1208753 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/mod/mod_log_config.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_log_config.xml.tr?rev=1209061&r1=1209060&r2=1209061&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_log_config.xml.tr [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_log_config.xml.tr [utf-8] Thu Dec 1 12:56:15 2011
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?>
-<!-- English Revision: 723557:1205075 (outdated) -->
+<!-- English Revision: 723557:1208753 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_remoteip.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_remoteip.html.en?rev=1209061&r1=1209060&r2=1209061&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_remoteip.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_remoteip.html.en Thu Dec 1 12:56:15 2011
@@ -24,31 +24,31 @@
<p><span>Available Languages: </span><a href="../en/mod/mod_remoteip.html" title="English"> en </a> |
<a href="../fr/mod/mod_remoteip.html" hreflang="fr" rel="alternate" title="Français"> fr </a></p>
</div>
-<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Replaces the apparent client remote IP address for the request
-with the IP address list presented by a proxies or a load balancer via the
-request headers.
+<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Replaces the original peer IP address for the connection
+with the client IP address list presented by a proxies or a load balancer
+via the request headers.
</td></tr>
<tr><th><a href="module-dict.html#Status">Status:</a></th><td>Base</td></tr>
<tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier:</a></th><td>remoteip_module</td></tr>
<tr><th><a href="module-dict.html#SourceFile">Source File:</a></th><td>mod_remoteip.c</td></tr></table>
<h3>Summary</h3>
- <p>This module is used to treat the remote host which initiated the
- request as the originating remote host as identified by httpd for the
- purposes of authorization and logging, even where that remote host is
+ <p>This module is used to treat the client which initiated the
+ request as the originating client as identified by httpd for the
+ purposes of authorization and logging, even where that client is
behind a load balancer, front end server, or proxy server.</p>
- <p>The module overrides the apparent remote (client) IP for
- the request with the IP address reported in the request header
- configured with the <code class="directive">RemoteIPHeader</code> directive.</p>
-
- <p>Once replaced as instructed, this apparent IP address is then used
- for the <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code>
- <code class="directive"><a href="../mod/mod_authz_host.html#require ip"><Require ip></a></code> feature,
- is reported by <code class="module"><a href="../mod/mod_status.html">mod_status</a></code>, and is recorded by
+ <p>The module overrides the peer IP address for the connection
+ with the client IP address reported in the request header configured
+ with the <code class="directive">RemoteIPHeader</code> directive.</p>
+
+ <p>Once replaced as instructed, this overridden client IP address is
+ then used for the <code class="module"><a href="../mod/mod_authz_host.html">mod_authz_host</a></code>
+ <code class="directive"><a href="../mod/mod_authz_host.html#require ip"><Require ip></a></code>
+ feature, is reported by <code class="module"><a href="../mod/mod_status.html">mod_status</a></code>, and is recorded by
<code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code> <code>%a</code> and <code class="module"><a href="../mod/core.html">core</a></code>
- <code>%a</code> format strings. The original remote IP of the connection is
- available in the <code>%{c}a</code> format string.</p>
+ <code>%a</code> format strings. The underlying peer IP of the connection
+ is available in the <code>%{c}a</code> format string.</p>
<div class="warning">It is critical to only enable this behavior from
intermediate hosts (proxies, etc) which are trusted by this server, since
@@ -76,23 +76,27 @@ request headers.
<div class="section">
<h2><a name="processing" id="processing">Remote IP Processing</a></h2>
- <p>Apache identifies the client with the connection's remote_ip value,
- and the connection remote_host and remote_logname are derived from this
- value. These fields play a role in authentication, authorization and
- logging and other purposes by other loadable modules.</p>
-
- <p>mod_remoteip replaces the true remote_ip with the advertised remote_ip as
- provided by a proxy, for every evaluation of the client that occurs in the
- server.</p>
+ <p>Apache by default identifies the client with the connection's
+ peer_ip value, and the connection remote_host and remote_logname are
+ derived from this value. These fields play a role in authentication,
+ authorization and logging and other purposes by other loadable
+ modules.</p>
+
+ <p>mod_remoteip overrides the peer IP of the connection with the
+ advertised client IP as provided by a proxy or load balancer, for
+ the duration of the request. A load balancer might establish a long
+ lived keepalive connection with the server, and each request will
+ have the correct client IP, even though the underlying peer IP
+ address of the load balancer remains unchanged.</p>
- <p>When multiple, comma delimited remote IP addresses are listed in the
+ <p>When multiple, comma delimited client IP addresses are listed in the
header value, they are processed in Right-to-Left order. Processing
- halts when a given remote IP address is not trusted to present the
+ halts when a given client IP address is not trusted to present the
preceding IP address. The header field is updated to this remaining
list of unconfirmed IP addresses, or if all IP addresses were trusted,
this header is removed from the request altogether.</p>
- <p>In replacing the remote_ip, the module stores the list of intermediate
+ <p>In overriding the client IP, the module stores the list of intermediate
hosts in a remoteip-proxy-ip-list note, which <code class="module"><a href="../mod/mod_log_config.html">mod_log_config</a></code>
can record using the <code>%{remoteip-proxy-ip-list}n</code> format token.
If the administrator needs to store this as an additional header, this
@@ -200,9 +204,10 @@ request headers.
</table>
<p>The <code class="directive">RemoteIPProxiesHeader</code> directive specifies
a header into which <code class="module"><a href="../mod/mod_remoteip.html">mod_remoteip</a></code> will collect a list of
- all of the intermediate client IP addresses trusted to resolve the actual
- remote IP. Note that intermediate <code class="directive">RemoteIPTrustedProxy</code>
- addresses are recorded in this header, while any intermediate
+ all of the intermediate client IP addresses trusted to resolve the client
+ IP of the request. Note that intermediate
+ <code class="directive">RemoteIPTrustedProxy</code> addresses are recorded in
+ this header, while any intermediate
<code class="directive">RemoteIPInternalProxy</code> addresses are discarded.</p>
<div class="example"><h3>Example</h3><p><code>
@@ -226,7 +231,7 @@ request headers.
<code class="directive">RemoteIPInternalProxy</code> directive, any intranet
or private IP address reported by such proxies, including the 10/8, 172.16/12,
192.168/16, 169.254/16 and 127/8 blocks (or outside of the IPv6 public
- 2000::/3 block) are not trusted as the remote IP, and are left in the
+ 2000::/3 block) are not trusted as the client IP, and are left in the
<code class="directive">RemoteIPHeader</code> header's value.</p>
<div class="example"><h3>Trusted (Load Balancer) Example</h3><p><code>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en?rev=1209061&r1=1209060&r2=1209061&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en Thu Dec 1 12:56:15 2011
@@ -871,6 +871,21 @@ later</td></tr>
Available in Apache HTTP Server 2.3.10 and later.</p>
</dd>
+ <dt><code>AllowNoSlash</code></dt>
+ <dd>
+ <p>By default, <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> will ignore URLs that map to a
+ directory on disk but lack a trailing slash, in the expectation that
+ the <code class="module"><a href="../mod/mod_dir.html">mod_dir</a></code> module will issue the client with a redirect to
+ the canonical URL with a trailing slash.</p>
+
+ <p>When the <code class="directive"><a href="../mod/mod_dir.html#directoryslash">DirectorySlash</a></code> directive
+ is set to off, the <code>AllowNoSlash</code> option can be enabled to ensure
+ that rewrite rules are no longer ignored. This option makes it possible to
+ apply rewrite rules within .htaccess files that match the directory without
+ a trailing slash, if so desired. Available in Apache HTTP Server 2.4.0 and
+ later.</p>
+ </dd>
+
</dl>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_session_crypto.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_session_crypto.html.en?rev=1209061&r1=1209060&r2=1209061&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_session_crypto.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_session_crypto.html.en Thu Dec 1 12:56:15 2011
@@ -55,6 +55,7 @@
<li><img alt="" src="../images/down.gif" /> <a href="#sessioncryptocipher">SessionCryptoCipher</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#sessioncryptodriver">SessionCryptoDriver</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#sessioncryptopassphrase">SessionCryptoPassphrase</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#sessioncryptopassphrasefile">SessionCryptoPassphraseFile</a></li>
</ul>
<h3>Topics</h3>
<ul id="topics">
@@ -193,6 +194,34 @@
</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="SessionCryptoPassphraseFile" id="SessionCryptoPassphraseFile">SessionCryptoPassphraseFile</a> <a name="sessioncryptopassphrasefile" id="sessioncryptopassphrasefile">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>File containing keys used to encrypt the session</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>SessionCryptoPassphraseFile <var>filename</var></code></td></tr>
+<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>none</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>Experimental</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_session_crypto</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache 2.3.0 and later</td></tr>
+</table>
+ <p>The <code class="directive">SessionCryptoPassphraseFile</code> directive specifies the
+ name of a configuration file containing the keys to use for encrypting or decrypting
+ the session, specified one per line. The file is read on server start, and a graceful
+ restart will be necessary for httpd to pick up changes to the keys.</p>
+
+ <p>Unlike the <code class="directive">SessionCryptoPassphrase</code> directive, the keys are
+ not exposed within the httpd configuration and can be hidden by protecting the file
+ appropriately.</p>
+
+ <p>Multiple keys can be specified in order to support key rotation. The first key
+ listed will be used for encryption, while all keys listed will be attempted for
+ decryption. To rotate keys across multiple servers over a period of time, add a new
+ secret to the end of the list, and once rolled out completely to all servers, remove
+ the first key from the start of the list.</p>
+
+
+</div>
</div>
<div class="bottomlang">
<p><span>Available Languages: </span><a href="../en/mod/mod_session_crypto.html" title="English"> en </a></p>