You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by nd...@apache.org on 2014/01/24 09:44:20 UTC
svn commit: r1560919 - in /httpd/httpd/trunk/docs/manual: expr.html.en
expr.html.fr expr.xml.fr expr.xml.meta mod/mod_proxy_ajp.html.en
mod/mod_proxy_ajp.xml.ja
Author: nd
Date: Fri Jan 24 08:44:19 2014
New Revision: 1560919
URL: http://svn.apache.org/r1560919
Log:
update transformation
Modified:
httpd/httpd/trunk/docs/manual/expr.html.en
httpd/httpd/trunk/docs/manual/expr.html.fr
httpd/httpd/trunk/docs/manual/expr.xml.fr
httpd/httpd/trunk/docs/manual/expr.xml.meta
httpd/httpd/trunk/docs/manual/mod/mod_proxy_ajp.html.en
httpd/httpd/trunk/docs/manual/mod/mod_proxy_ajp.xml.ja
Modified: httpd/httpd/trunk/docs/manual/expr.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/expr.html.en?rev=1560919&r1=1560918&r2=1560919&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/expr.html.en (original)
+++ httpd/httpd/trunk/docs/manual/expr.html.en Fri Jan 24 08:44:19 2014
@@ -25,17 +25,15 @@
<a href="./fr/expr.html" hreflang="fr" rel="alternate" title="Français"> fr </a></p>
</div>
- <p>Historically, there are several syntax variants for expressions used to express
- a condition in the different modules of the Apache HTTP Server.
- There is some ongoing effort to only use a single variant, called <em>ap_expr</em>,
- for all configuration directives.
- This document describes the <em>ap_expr</em> expression parser.
+ <p>Historically, there are several syntax variants for expressions
+ used to express a condition in the different modules of the Apache
+ HTTP Server. There is some ongoing effort to only use a single
+ variant, called <em>ap_expr</em>, for all configuration directives.
+ This document describes the <em>ap_expr</em> expression parser.
</p>
<p>The <em>ap_expr</em> expression is intended to replace most other
- expression variants in HTTPD. For example, the deprecated
- <code class="directive"><a href="./mod/mod_ssl.html#sslrequire">SSLRequire</a></code> expressions can be
- replaced by <a href="mod/mod_authz_core.html#reqexpr">Require expr</a>.
- </p>
+ expression variants in HTTPD. For example, the deprecated <code class="directive"><a href="./mod/mod_ssl.html#sslrequire">SSLRequire</a></code> expressions can be replaced
+ by <a href="mod/mod_authz_core.html#reqexpr">Require expr</a>. </p>
</div>
<div id="quickview"><ul id="toc"><li><img alt="" src="./images/down.gif" /> <a href="#grammar">Grammar in Backus-Naur Form notation</a></li>
<li><img alt="" src="./images/down.gif" /> <a href="#vars">Variables</a></li>
@@ -51,12 +49,14 @@
<div class="section">
<h2><a name="grammar" id="grammar">Grammar in Backus-Naur Form notation</a></h2>
- <p><a href="http://en.wikipedia.org/wiki/Backus%E2%80%93Naur_Form">Backus-Naur Form</a> (BNF) is a notation
- technique for context-free grammars, often used to describe the syntax of languages used in computing.
- In most cases, expressions are used to express boolean values.
- For these, the starting point in the BNF is <code>expr</code>. However, a few directives
- like <code class="directive"><a href="./mod/mod_log_debug.html#logmessage">LogMessage</a></code> accept expressions
- that evaluate to a string value. For those, the starting point in the BNF is <code>string</code>.
+ <p><a href="http://en.wikipedia.org/wiki/Backus%E2%80%93Naur_Form">Backus-Naur
+ Form</a> (BNF) is a notation technique for context-free grammars,
+ often used to describe the syntax of languages used in computing.
+ In most cases, expressions are used to express boolean values. For
+ these, the starting point in the BNF is <code>expr</code>.
+ However, a few directives like <code class="directive"><a href="./mod/mod_log_debug.html#logmessage">LogMessage</a></code> accept expressions
+ that evaluate to a string value. For those, the starting point in
+ the BNF is <code>string</code>.
</p>
<blockquote>
<pre>
@@ -229,8 +229,8 @@ listfunction ::= listfuncname "<strong>(
<td>The <code class="directive"><a href="./mod/core.html#documentroot">DocumentRoot</a></code> of
the current vhost</td></tr>
<tr class="odd"><td><code>AUTH_TYPE</code></td>
- <td>The configured <code class="directive"><a href="./mod/mod_authn_core.html#authtype">AuthType</a></code>
- (e.g. "<code>basic</code>")</td></tr>
+ <td>The configured <code class="directive"><a href="./mod/mod_authn_core.html#authtype">AuthType</a></code> (e.g.
+ "<code>basic</code>")</td></tr>
<tr><td><code>CONTENT_TYPE</code></td>
<td>The content type of the response</td></tr>
<tr class="odd"><td><code>HANDLER</code></td>
@@ -275,14 +275,16 @@ listfunction ::= listfuncname "<strong>(
<td>The day of the week (starting with <code>0</code>
for Sunday)</td></tr>
<tr class="odd"><td><code>TIME</code></td>
- <td>The date and time in the format <code>20101231235959</code></td></tr>
+ <td>The date and time in the format
+ <code>20101231235959</code></td></tr>
<tr><td><code>SERVER_SOFTWARE</code></td>
<td>The server version string</td></tr>
<tr class="odd"><td><code>API_VERSION</code></td>
<td>The date of the API version (module magic number)</td></tr>
</table>
- <p>Some modules register additional variables, see e.g. <code class="module"><a href="./mod/mod_ssl.html">mod_ssl</a></code>.</p>
+ <p>Some modules register additional variables, see e.g.
+ <code class="module"><a href="./mod/mod_ssl.html">mod_ssl</a></code>.</p>
</div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
<div class="section">
@@ -405,7 +407,8 @@ listfunction ::= listfuncname "<strong>(
"<code>false</code>", or "<code>no</code>" (case insensitive).
True otherwise.</td><td /></tr>
<tr><td><code>-R</code></td>
- <td>Same as "<code>%{REMOTE_ADDR} -ipmatch ...</code>", but more efficient
+ <td>Same as "<code>%{REMOTE_ADDR} -ipmatch ...</code>", but more
+ efficient
</td><td /></tr>
</table>
@@ -430,7 +433,9 @@ listfunction ::= listfuncname "<strong>(
<tr><td><code>resp</code></td>
<td>Get HTTP response header</td><td /></tr>
<tr class="odd"><td><code>reqenv</code></td>
- <td>Lookup request environment variable (as a shortcut, <code>v</code> can be used too to access variables).</td><td /></tr>
+ <td>Lookup request environment variable (as a shortcut,
+ <code>v</code> can be used too to access
+ variables).</td><td /></tr>
<tr><td><code>osenv</code></td>
<td>Lookup operating system environment variable</td><td /></tr>
<tr class="odd"><td><code>note</code></td>
@@ -474,11 +479,11 @@ listfunction ::= listfuncname "<strong>(
the expression. The <code>req_novary</code> function can be used to
prevent names from being added to the Vary header.</p>
- <p>In addition to string-valued functions, there are also list-valued functions which
- take one string as argument and return a wordlist, i.e. a list of strings. The wordlist
- can be used with the special <code>-in</code> operator.
- Functions names are not case sensitive.
- Modules may register additional functions.</p>
+ <p>In addition to string-valued functions, there are also
+ list-valued functions which take one string as argument and return a
+ wordlist, i.e. a list of strings. The wordlist can be used with the
+ special <code>-in</code> operator. Functions names are not case
+ sensitive. Modules may register additional functions.</p>
<p>There are no built-in list-valued functions. <code class="module"><a href="./mod/mod_ssl.html">mod_ssl</a></code>
provides <code>PeerExtList</code>. See the description of
@@ -491,7 +496,9 @@ listfunction ::= listfuncname "<strong>(
<h2><a name="examples" id="examples">Example expressions</a></h2>
- <p>The following examples show how expressions might be used to evaluate requests:</p>
+ <p>The following examples show how expressions might be used to
+ evaluate requests:</p>
+
<pre class="prettyprint lang-config">
# Compare the host name to example.com and redirect to www.example.com if it matches
@@ -521,7 +528,8 @@ listfunction ::= listfuncname "<strong>(
<td>string contained in string list</td></tr>
<tr class="odd"><td><code>/regexp/</code></td>
<td><code>m#regexp#</code></td>
- <td>Regular expression (the second form allows different delimiters than /)</td></tr>
+ <td>Regular expression (the second form allows different
+ delimiters than /)</td></tr>
<tr><td><code>/regexp/i</code></td>
<td><code>m#regexp#i</code></td>
<td>Case insensitive regular expression</td></tr>
Modified: httpd/httpd/trunk/docs/manual/expr.html.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/expr.html.fr?rev=1560919&r1=1560918&r2=1560919&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/expr.html.fr (original)
+++ httpd/httpd/trunk/docs/manual/expr.html.fr Fri Jan 24 08:44:19 2014
@@ -24,6 +24,8 @@
<p><span>Langues Disponibles: </span><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="outofdate">Cette traduction peut être périmée. Vérifiez la version
+ anglaise pour les changements récents.</div>
<p>Historiquement, il existe de nombreuses variantes dans la syntaxe
des expressions permettant d'exprimer une condition dans les
Modified: httpd/httpd/trunk/docs/manual/expr.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/expr.xml.fr?rev=1560919&r1=1560918&r2=1560919&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/expr.xml.fr (original)
+++ httpd/httpd/trunk/docs/manual/expr.xml.fr Fri Jan 24 08:44:19 2014
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
<!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd">
<?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?>
-<!-- English Revision : 1554188 -->
+<!-- English Revision: 1554188:1560918 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
Modified: httpd/httpd/trunk/docs/manual/expr.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/expr.xml.meta?rev=1560919&r1=1560918&r2=1560919&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/expr.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/expr.xml.meta Fri Jan 24 08:44:19 2014
@@ -8,6 +8,6 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
</variants>
</metafile>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy_ajp.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy_ajp.html.en?rev=1560919&r1=1560918&r2=1560919&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy_ajp.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy_ajp.html.en Fri Jan 24 08:44:19 2014
@@ -206,11 +206,12 @@ ProxyPassReverse /apps/foo http://www.ex
suggest that the maximum payload could be as large as 2^16, in fact, the
code sets the maximum to be 8K.</p>
<table>
+
<tr>
- <td colspan="6"><em>Packet Format (Server->Container)</em></td>
+ <th colspan="6"><em>Packet Format (Server->Container)</em></th>
</tr>
<tr>
- <td>Byte</td>
+ <th>Byte</th>
<td>0</td>
<td>1</td>
<td>2</td>
@@ -218,7 +219,7 @@ ProxyPassReverse /apps/foo http://www.ex
<td>4...(n+3)</td>
</tr>
<tr>
- <td>Contents</td>
+ <th>Contents</th>
<td>0x12</td>
<td>0x34</td>
<td colspan="2">Data Length (n)</td>
@@ -226,11 +227,12 @@ ProxyPassReverse /apps/foo http://www.ex
</tr>
</table>
<table>
+
<tr>
- <td colspan="6"><em>Packet Format (Container->Server)</em></td>
+ <th colspan="6"><em>Packet Format (Container->Server)</em></th>
</tr>
<tr>
- <td>Byte</td>
+ <th>Byte</th>
<td>0</td>
<td>1</td>
<td>2</td>
@@ -238,7 +240,7 @@ ProxyPassReverse /apps/foo http://www.ex
<td>4...(n+3)</td>
</tr>
<tr>
- <td>Contents</td>
+ <th>Contents</th>
<td>A</td>
<td>B</td>
<td colspan="2">Data Length (n)</td>
@@ -253,6 +255,7 @@ ProxyPassReverse /apps/foo http://www.ex
<p>The web server can send the following messages to the servlet
container:</p>
<table>
+
<tr>
<td>Code</td>
<td>Type of Packet</td>
@@ -294,6 +297,7 @@ ProxyPassReverse /apps/foo http://www.ex
<p>The servlet container can send the following types of messages to the
webserver:</p>
<table>
+
<tr>
<td>Code</td>
<td>Type of Packet</td>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy_ajp.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy_ajp.xml.ja?rev=1560919&r1=1560918&r2=1560919&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy_ajp.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy_ajp.xml.ja [utf-8] Fri Jan 24 08:44:19 2014
@@ -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: 669473:1421821 (outdated) -->
+<!-- English Revision: 669473:1560918 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more