You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2017/06/05 12:13:24 UTC
svn commit: r1797654 - in /httpd/httpd/branches/2.4.x/docs/manual: ./ misc/
mod/ rewrite/
Author: covener
Date: Mon Jun 5 12:13:24 2017
New Revision: 1797654
URL: http://svn.apache.org/viewvc?rev=1797654&view=rev
Log:
xforms
Modified:
httpd/httpd/branches/2.4.x/docs/manual/expr.html.en
httpd/httpd/branches/2.4.x/docs/manual/expr.xml.fr
httpd/httpd/branches/2.4.x/docs/manual/expr.xml.meta
httpd/httpd/branches/2.4.x/docs/manual/misc/relevant_standards.html.en
httpd/httpd/branches/2.4.x/docs/manual/misc/relevant_standards.xml.ko
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.html.en
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.fr
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.ja
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.meta
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_wstunnel.html.en
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.html.en
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.xml.fr
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.xml.meta
httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.html.en
httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.xml.fr
httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.xml.meta
Modified: httpd/httpd/branches/2.4.x/docs/manual/expr.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/expr.html.en?rev=1797654&r1=1797653&r2=1797654&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/expr.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/expr.html.en Mon Jun 5 12:13:24 2017
@@ -315,6 +315,12 @@ listfunction ::= listfuncname "<strong>(
<tr class="odd"><td><code>>=</code></td>
<td />
<td>String greater than or equal</td></tr>
+<tr><td><code>=~</code></td>
+ <td />
+ <td>String matches the regular expression</td></tr>
+<tr class="odd"><td><code>!~</code></td>
+ <td />
+ <td>String does not match the regular expression</td></tr>
<tr><td><code>-eq</code></td>
<td><code>eq</code></td>
<td>Integer equality</td></tr>
Modified: httpd/httpd/branches/2.4.x/docs/manual/expr.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/expr.xml.fr?rev=1797654&r1=1797653&r2=1797654&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/expr.xml.fr [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/expr.xml.fr [utf-8] Mon Jun 5 12:13:24 2017
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>
-<!-- English Revision: 1789244 -->
+<!-- English Revision: 1789244:1796727 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
Modified: httpd/httpd/branches/2.4.x/docs/manual/expr.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/expr.xml.meta?rev=1797654&r1=1797653&r2=1797654&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/expr.xml.meta (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/expr.xml.meta Mon Jun 5 12:13:24 2017
@@ -8,6 +8,6 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
</variants>
</metafile>
Modified: httpd/httpd/branches/2.4.x/docs/manual/misc/relevant_standards.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/misc/relevant_standards.html.en?rev=1797654&r1=1797653&r2=1797654&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/misc/relevant_standards.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/misc/relevant_standards.html.en Mon Jun 5 12:13:24 2017
@@ -176,7 +176,7 @@
code set (639-1) and another as a three-letter code set (this part
of ISO 639) for the representation of names of languages.</dd>
- <dt><a href="http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/index.html">
+ <dt><a href="http://www.iso.org/iso/country_codes">
ISO 3166-1</a></dt>
<dd>These pages document the country names (official short names
Modified: httpd/httpd/branches/2.4.x/docs/manual/misc/relevant_standards.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/misc/relevant_standards.xml.ko?rev=1797654&r1=1797653&r2=1797654&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/misc/relevant_standards.xml.ko [euc-kr] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/misc/relevant_standards.xml.ko [euc-kr] Mon Jun 5 12:13:24 2017
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="EUC-KR" ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?>
-<!-- English Revision: 420993:1174747 (outdated) -->
+<!-- English Revision: 420993:1796503 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.html.en?rev=1797654&r1=1797653&r2=1797654&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.html.en Mon Jun 5 12:13:24 2017
@@ -1297,6 +1297,16 @@ ProxyPass "/mirror/foo" "http://backend.
<td><p>Name of the provider used by <code class="module"><a href="../mod/mod_proxy_fdpass.html">mod_proxy_fdpass</a></code>.
See the documentation of this module for more details.</p>
</td></tr>
+ <tr><td>secret</td>
+ <td>-</td>
+ <td><p>Value of secret used by <code class="module"><a href="../mod/mod_proxy_ajp.html">mod_proxy_ajp</a></code>.
+ See the documentation of this module for more details.</p>
+ </td></tr>
+ <tr><td>upgrade</td>
+ <td>WebSocket</td>
+ <td><p>Protocol accepted in the Upgrade header by <code class="module"><a href="../mod/mod_proxy_wstunnel.html">mod_proxy_wstunnel</a></code>.
+ See the documentation of this module for more details.</p>
+ </td></tr>
</table>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.fr?rev=1797654&r1=1797653&r2=1797654&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.fr [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.fr [utf-8] Mon Jun 5 12:13:24 2017
@@ -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.fr.xsl"?>
-<!-- English Revision: 1785909 -->
+<!-- English Revision: 1785909:1797650 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.ja?rev=1797654&r1=1797653&r2=1797654&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.ja [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.ja [utf-8] Mon Jun 5 12:13:24 2017
@@ -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: 344971:1785909 (outdated) -->
+<!-- English Revision: 344971:1797650 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.meta?rev=1797654&r1=1797653&r2=1797654&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.meta (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.meta Mon Jun 5 12:13:24 2017
@@ -8,7 +8,7 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
<variant outdated="yes">ja</variant>
</variants>
</metafile>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_wstunnel.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_wstunnel.html.en?rev=1797654&r1=1797653&r2=1797654&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_wstunnel.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_wstunnel.html.en Mon Jun 5 12:13:24 2017
@@ -51,6 +51,11 @@ ProxyPass "/wss2/" "wss://echo.websocket
<p>Load balancing for multiple backends can be achieved using <code class="module"><a href="../mod/mod_proxy_balancer.html">mod_proxy_balancer</a></code>.</p>
+
+<p>In fact the module can be used to upgrade to other protocols, you can set the <code>upgrade</code>
+parameter in the <code class="directive"><a href="../mod/mod_proxy.html#proxypass">ProxyPass</a></code>
+directive to allow the module to accept other protocol.
+NONE means you bypass the check for the header but still upgrade to WebSocket.</p>
</div>
<div id="quickview"><a href="https://www.apache.org/foundation/contributing.html" class="badge"><img src="https://www.apache.org/images/SupportApache-small.png" alt="Support Apache!" /></a><h3 class="directives">Directives</h3>
<p>This module provides no
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.html.en?rev=1797654&r1=1797653&r2=1797654&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.html.en Mon Jun 5 12:13:24 2017
@@ -1013,6 +1013,24 @@ RewriteRule "^/$" "/hom
supply this extended context info. Available in 2.4.16 and later.</p>
</dd>
+
+ <dt><code>LegacyPrefixDocRoot</code></dt>
+ <dd>
+
+ <p>Prior to 2.4.25, if a substitution was an absolute URL that matched
+ the current virtual host, the URL might first be reduced to a URL-path
+ and then later reduced to a local path. Since the URL can be reduced
+ to a local path, the path should be prefixed with the document root.
+ This prevents a file such as /tmp/myfile from being accessed when a
+ request is made to http://host/file/myfile with the following
+ <code class="directive"><a href="#rewriterule">RewriteRule</a></code>.</p>
+ <pre class="prettyprint lang-config">RewriteRule /file/(.*) http://localhost/tmp/$1</pre>
+
+ <p>This option allows the old behavior to be used where the document
+ root is not prefixed to a local path that was reduced from a
+ URL. Available in 2.4.25 and later.</p>
+ </dd>
+
</dl>
</div>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.xml.fr?rev=1797654&r1=1797653&r2=1797654&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.xml.fr [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.xml.fr [utf-8] Mon Jun 5 12:13:24 2017
@@ -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.fr.xsl"?>
-<!-- English Revision: 1780218 -->
+<!-- English Revision: 1780218:1796852 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.xml.meta?rev=1797654&r1=1797653&r2=1797654&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.xml.meta (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_rewrite.xml.meta Mon Jun 5 12:13:24 2017
@@ -8,6 +8,6 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
</variants>
</metafile>
Modified: httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.html.en?rev=1797654&r1=1797653&r2=1797654&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.html.en Mon Jun 5 12:13:24 2017
@@ -33,6 +33,7 @@ providing detailed explanations and exam
</div>
<div id="quickview"><a href="https://www.apache.org/foundation/contributing.html" class="badge"><img src="https://www.apache.org/images/SupportApache-small.png" alt="Support Apache!" /></a><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#introduction">Introduction</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#flag_b">B (escape backreferences)</a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#flag_bnp">BNP|backrefnoplus (don't escape space to +)</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#flag_c">C|chain</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#flag_co">CO|cookie</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#flag_dpi">DPI|discardpath</a></li>
@@ -83,8 +84,11 @@ of how you might use them.</p>
<div class="section">
<h2><a name="flag_b" id="flag_b">B (escape backreferences)</a></h2>
<p>The [B] flag instructs <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> to escape non-alphanumeric
-characters before applying the transformation.
-</p>
+characters before applying the transformation.</p>
+<p>In 2.4.26 and later, you can limit the escaping to specific characters
+in backreferences by listing them: <code>[B=#?;]</code>. Note: The space
+character can be used in the list of characters to escape, but it cannot be
+the last character in the list.</p>
<p><code>mod_rewrite</code> has to unescape URLs before mapping them,
so backreferences are unescaped at the time they are applied.
@@ -114,6 +118,17 @@ returns a 404 if it sees one.</p>
<p>This escaping is particularly necessary in a proxy situation,
when the backend may break if presented with an unescaped URL.</p>
+<p>An alternative to this flag is using a <code class="directive"><a href="../mod/mod_rewrite.html#rewritecond">RewriteCond</a></code> to capture against %{THE_REQUEST} which will capture
+strings in the encoded form.</p>
+</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="section">
+<h2><a name="flag_bnp" id="flag_bnp">BNP|backrefnoplus (don't escape space to +)</a></h2>
+<p>The [BNP] flag instructs <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code> to escape the space character
+in a backreference to %20 rather than '+'. Useful when the backreference
+will be used in the path component rather than the query string.</p>
+
+<p>This flag is available in version 2.4.26 and later.</p>
+
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="section">
<h2><a name="flag_c" id="flag_c">C|chain</a></h2>
Modified: httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.xml.fr?rev=1797654&r1=1797653&r2=1797654&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.xml.fr [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.xml.fr [utf-8] Mon Jun 5 12:13:24 2017
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1762653 -->
+<!-- English Revision: 1762653:1796850 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
Modified: httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.xml.meta?rev=1797654&r1=1797653&r2=1797654&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.xml.meta (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/rewrite/flags.xml.meta Mon Jun 5 12:13:24 2017
@@ -8,6 +8,6 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
</variants>
</metafile>