You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2016/02/04 19:43:44 UTC
svn commit: r1728526 - in /httpd/httpd/trunk/docs/manual: ./ mod/
Author: jim
Date: Thu Feb 4 18:43:43 2016
New Revision: 1728526
URL: http://svn.apache.org/viewvc?rev=1728526&view=rev
Log:
xforms
Modified:
httpd/httpd/trunk/docs/manual/expr.html.en
httpd/httpd/trunk/docs/manual/expr.html.fr
httpd/httpd/trunk/docs/manual/expr.xml.meta
httpd/httpd/trunk/docs/manual/mod/mod_deflate.html
httpd/httpd/trunk/docs/manual/mod/mod_proxy.html
httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en
httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.fr
httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.fr
httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja
httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta
httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en
httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml.fr
Modified: httpd/httpd/trunk/docs/manual/expr.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/expr.html.en?rev=1728526&r1=1728525&r2=1728526&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/expr.html.en (original)
+++ httpd/httpd/trunk/docs/manual/expr.html.en Thu Feb 4 18:43:43 2016
@@ -23,7 +23,8 @@
<div id="path">
<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs/">Documentation</a> > <a href="./">Version 2.5</a></div><div id="page-content"><div id="preamble"><h1>Expressions in Apache HTTP Server</h1>
<div class="toplang">
-<p><span>Available Languages: </span><a href="./en/expr.html" title="English"> en </a> |
+<p><span>Available Languages: </span><a href="./edited/expr.html" hreflang="edited" rel="alternate" title=""> edited </a> |
+<a href="./en/expr.html" title="English"> en </a> |
<a href="./fr/expr.html" hreflang="fr" rel="alternate" title="Français"> fr </a></p>
</div>
@@ -622,7 +623,8 @@ Header always set CustomHeader my-value
are available for versions 2.5.0 and later.</p>
</div></div>
<div class="bottomlang">
-<p><span>Available Languages: </span><a href="./en/expr.html" title="English"> en </a> |
+<p><span>Available Languages: </span><a href="./edited/expr.html" hreflang="edited" rel="alternate" title=""> edited </a> |
+<a href="./en/expr.html" title="English"> en </a> |
<a href="./fr/expr.html" hreflang="fr" rel="alternate" title="Français"> fr </a></p>
</div><div class="top"><a href="#page-header"><img src="./images/up.gif" alt="top" /></a></div><div class="section"><h2><a id="comments_section" name="comments_section">Comments</a></h2><div class="warning"><strong>Notice:</strong><br />This is not a Q&A section. Comments placed here should be pointed towards suggestions on improving the documentation or server, and may be removed again by our moderators if they are either implemented or considered invalid/off-topic. Questions on how to manage the Apache HTTP Server should be directed at either our IRC channel, #httpd, on Freenode, or sent to our <a href="http://httpd.apache.org/lists.html">mailing lists</a>.</div>
<script type="text/javascript"><!--//--><![CDATA[//><!--
Modified: httpd/httpd/trunk/docs/manual/expr.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/expr.html.fr?rev=1728526&r1=1728525&r2=1728526&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/expr.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/expr.html.fr Thu Feb 4 18:43:43 2016
@@ -23,7 +23,8 @@
<div id="path">
<a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">Serveur HTTP</a> > <a href="http://httpd.apache.org/docs/">Documentation</a> > <a href="./">Version 2.5</a></div><div id="page-content"><div id="preamble"><h1>Les expressions dans le serveur HTTP Apache</h1>
<div class="toplang">
-<p><span>Langues Disponibles: </span><a href="./en/expr.html" hreflang="en" rel="alternate" title="English"> en </a> |
+<p><span>Langues Disponibles: </span><a href="./edited/expr.html" hreflang="edited" rel="alternate" title=""> edited </a> |
+<a href="./en/expr.html" hreflang="en" rel="alternate" title="English"> en </a> |
<a href="./fr/expr.html" title="Français"> fr </a></p>
</div>
@@ -651,7 +652,8 @@ Header always set CustomHeader my-value
de la version 2.5.0 du serveur HTTP Apache.</p>
</div></div>
<div class="bottomlang">
-<p><span>Langues Disponibles: </span><a href="./en/expr.html" hreflang="en" rel="alternate" title="English"> en </a> |
+<p><span>Langues Disponibles: </span><a href="./edited/expr.html" hreflang="edited" rel="alternate" title=""> edited </a> |
+<a href="./en/expr.html" hreflang="en" rel="alternate" title="English"> en </a> |
<a href="./fr/expr.html" title="Français"> fr </a></p>
</div><div class="top"><a href="#page-header"><img src="./images/up.gif" alt="top" /></a></div><div class="section"><h2><a id="comments_section" name="comments_section">Commentaires</a></h2><div class="warning"><strong>Notice:</strong><br />This is not a Q&A section. Comments placed here should be pointed towards suggestions on improving the documentation or server, and may be removed again by our moderators if they are either implemented or considered invalid/off-topic. Questions on how to manage the Apache HTTP Server should be directed at either our IRC channel, #httpd, on Freenode, or sent to our <a href="http://httpd.apache.org/lists.html">mailing lists</a>.</div>
<script type="text/javascript"><!--//--><![CDATA[//><!--
Modified: httpd/httpd/trunk/docs/manual/expr.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/expr.xml.meta?rev=1728526&r1=1728525&r2=1728526&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/expr.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/expr.xml.meta Thu Feb 4 18:43:43 2016
@@ -7,6 +7,7 @@
<relpath>.</relpath>
<variants>
+ <variant>edited</variant>
<variant>en</variant>
<variant>fr</variant>
</variants>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_deflate.html
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_deflate.html?rev=1728526&r1=1728525&r2=1728526&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_deflate.html (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_deflate.html Thu Feb 4 18:43:43 2016
@@ -6,7 +6,7 @@ Content-type: text/html; charset=ISO-885
URI: mod_deflate.html.fr
Content-Language: fr
-Content-type: text/html; charset=UTF-8
+Content-type: text/html; charset=ISO-8859-1
URI: mod_deflate.html.ja.utf8
Content-Language: ja
Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.html
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.html?rev=1728526&r1=1728525&r2=1728526&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.html (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.html Thu Feb 4 18:43:43 2016
@@ -6,7 +6,7 @@ Content-type: text/html; charset=ISO-885
URI: mod_proxy.html.fr
Content-Language: fr
-Content-type: text/html; charset=UTF-8
+Content-type: text/html; charset=ISO-8859-1
URI: mod_proxy.html.ja.utf8
Content-Language: ja
Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en?rev=1728526&r1=1728525&r2=1728526&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.en Thu Feb 4 18:43:43 2016
@@ -1211,8 +1211,8 @@ ProxyPass "/mirror/foo" "http://backen
<td><p>This parameter should be used when you have a firewall between your
Apache httpd and the backend server, which tends to drop inactive connections.
This flag will tell the Operating System to send <code>KEEP_ALIVE</code>
- messages on inactive connections and thus prevent the firewall
- from dropping the connection.
+ messages on inactive connections and thus prevent the firewall
+ from dropping the connection.
To enable keepalive, set this property value to <code>On</code>. </p>
<p>The frequency of initial and subsequent TCP keepalive probes
depends on global OS settings, and may be as high as 2 hours. To be useful,
@@ -1280,16 +1280,18 @@ ProxyPass "/mirror/foo" "http://backen
<td>Single letter value defining the initial status of
this worker.
<table>
- <tr><td>D: Worker is disabled and will not accept any requests.</td></tr>
- <tr><td>S: Worker is administratively stopped.</td></tr>
- <tr><td>I: Worker is in ignore-errors mode and will always be considered available.</td></tr>
- <tr><td>H: Worker is in hot-standby mode and will only be used if no other
+ <tr><td>D</td><td>Worker is disabled and will not accept any requests; will be
+ automatically retried.</td></tr>
+ <tr><td>S</td><td>Worker is administratively stopped; will not accept requests
+ and will not be automatically retried</td></tr>
+ <tr><td>I</td><td>Worker is in ignore-errors mode and will always be considered available.</td></tr>
+ <tr><td>H</td><td>Worker is in hot-standby mode and will only be used if no other
viable workers are available.</td></tr>
- <tr><td>E: Worker is in an error state.</td></tr>
- <tr><td>N: Worker is in drain mode and will only accept existing sticky sessions
+ <tr><td>E</td><td>Worker is in an error state.</td></tr>
+ <tr><td>N</td><td>Worker is in drain mode and will only accept existing sticky sessions
destined for itself and ignore all other requests.</td></tr>
- </table>Status
- can be set (which is the default) by prepending with '+' or
+ </table>
+ Status can be set (which is the default) by prepending with '+' or
cleared by prepending with '-'.
Thus, a setting of 'S-E' sets this worker to Stopped and
clears the in-error flag.
@@ -1445,7 +1447,7 @@ ProxyPass "/" "balancer://my
But this may be incompatible with some backends, particularly those
that make use of <var>PATH_INFO</var>. The optional <var>nocanon</var>
keyword suppresses this and passes the URL path "raw" to the
- backend. Note that this keyword may affect the security of your backend,
+ backend. Note that this keyword may affect the security of your backend,
as it removes the normal limited protection against URL-based attacks
provided by the proxy.</p>
@@ -1635,7 +1637,7 @@ ProxyPassReverseCookiePath "/" "/mirro
<p>will not only cause a local request for the
<code>http://example.com/mirror/foo/bar</code> to be internally converted
into a proxy request to <code>http://backend.example.com/bar</code>
- (the functionality which <code>ProxyPass</code> provides here).
+ (the functionality which <code>ProxyPass</code> provides here).
It also takes care of redirects which the server <code>backend.example.com</code> sends
when redirecting <code>http://backend.example.com/bar</code> to
<code>http://backend.example.com/quux</code> . Apache httpd adjusts this to
@@ -1884,7 +1886,7 @@ expressions</td></tr>
<div class="warning"><h3>Warning</h3>
<p>Keep in mind that the same parameter key can have a different meaning
- depending whether it is applied to a balancer or a worker, as shown by
+ depending whether it is applied to a balancer or a worker, as shown by
the two examples above regarding timeout.</p>
</div>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.fr?rev=1728526&r1=1728525&r2=1728526&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.html.fr Thu Feb 4 18:43:43 2016
@@ -30,6 +30,8 @@
<a href="../fr/mod/mod_proxy.html" title="Français"> fr </a> |
<a href="../ja/mod/mod_proxy.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a></p>
</div>
+<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version
+ anglaise pour les changements récents.</div>
<table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Serveur mandataire/passerelle multi-protocole</td></tr>
<tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Extension</td></tr>
<tr><th><a href="module-dict.html#ModuleIdentifier">Identificateur de Module:</a></th><td>proxy_module</td></tr>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.fr?rev=1728526&r1=1728525&r2=1728526&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.fr (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.fr Thu Feb 4 18:43:43 2016
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1717063 -->
+<!-- English Revision: 1717063:1728305 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja?rev=1728526&r1=1728525&r2=1728526&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.ja [utf-8] Thu Feb 4 18:43:43 2016
@@ -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:1717063 (outdated) -->
+<!-- English Revision: 344971:1728305 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta?rev=1728526&r1=1728525&r2=1728526&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta Thu Feb 4 18:43:43 2016
@@ -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/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=1728526&r1=1728525&r2=1728526&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_rewrite.html.en Thu Feb 4 18:43:43 2016
@@ -300,7 +300,6 @@ AliasMatch "^/myapp" "/opt/myapp-1.2.3"
respectively.</p>
<p>Those that are special to mod_rewrite include those below.</p>
- <div class="note">
<dl>
<dt><code>API_VERSION</code></dt>
@@ -374,7 +373,6 @@ AliasMatch "^/myapp" "/opt/myapp-1.2.3"
(decoded), unlike most other variables below.</dd>
</dl>
-</div>
</li>
</ul>
@@ -583,14 +581,14 @@ AliasMatch "^/myapp" "/opt/myapp-1.2.3"
<dl>
<dt><strong>-d</strong></dt>
-
+
<dd>Is <strong>d</strong>irectory.<br />
Treats the <em>TestString</em> as a pathname and tests
whether or not it exists, and is a directory.
</dd>
<dt><strong>-f</strong></dt>
-
+
<dd>Is regular <strong>f</strong>ile.<br />
Treats the <em>TestString</em> as a pathname and tests
@@ -598,7 +596,7 @@ AliasMatch "^/myapp" "/opt/myapp-1.2.3"
</dd>
<dt><strong>-F</strong></dt>
-
+
<dd>Is existing file, via subrequest.<br />
Checks whether or not <em>TestString</em> is a valid file,
accessible via all the server's currently-configured
@@ -613,7 +611,7 @@ AliasMatch "^/myapp" "/opt/myapp-1.2.3"
</dd>
<dt><strong>-l</strong></dt>
-
+
<dd>Is symbolic <strong>l</strong>ink.<br />
Treats the <em>TestString</em> as a pathname and tests
whether or not it exists, and is a symbolic link. May also
@@ -657,8 +655,8 @@ AliasMatch "^/myapp" "/opt/myapp-1.2.3"
For example:
- <pre class="prettyprint lang-config"> RewriteCond /var/www/%{REQUEST_URI} !-f
- RewriteRule ^(.+) /other/archive/$1 [R]</pre>
+ <pre class="prettyprint lang-config">RewriteCond /var/www/%{REQUEST_URI} !-f
+RewriteRule ^(.+) /other/archive/$1 [R]</pre>
</li>
@@ -1056,6 +1054,13 @@ RewriteRule "^/$" "/hom
<code>%{HTTP_HOST}</code>, <code>%{SERVER_PORT}</code>, or
<code>%{QUERY_STRING}</code> variables respectively.</p>
+ <p>In any case, remember that regular expressions are substring
+ matches. That is, you don't need the regex to describe the entire
+ string, just the part that you wish to match. Thus, using a regex
+ of <code>.</code> is often sufficient rather than <code>.*</code>,
+ and the regex <code>abc</code> is <strong>not</strong> the same as
+ <code>^abc$</code>.</p>
+
</div>
<div class="note"><h3>Per-directory Rewrites</h3>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml.fr?rev=1728526&r1=1728525&r2=1728526&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml.fr (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml.fr Thu Feb 4 18:43:43 2016
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?>
-<!-- English Revision: 1706989:1727974 (outdated) -->
+<!-- English Revision: 1706989:1728314 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->