diff options
author | Luca Toscano <elukey@apache.org> | 2016-12-31 09:12:30 +0000 |
---|---|---|
committer | Luca Toscano <elukey@apache.org> | 2016-12-31 09:12:30 +0000 |
commit | 565380086d1b11e959e37e8f1594bdee3ec3f97b (patch) | |
tree | 2283fdb9ab40a44861d76f7b7c37955bfbf79fee | |
parent | e1693accceaac148cb405cc841748d2bcbe9b01b (diff) | |
download | httpd-565380086d1b11e959e37e8f1594bdee3ec3f97b.tar.gz |
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1776709 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | docs/manual/expr.html.en | 48 | ||||
-rw-r--r-- | docs/manual/expr.xml.fr | 2 | ||||
-rw-r--r-- | docs/manual/expr.xml.meta | 2 | ||||
-rw-r--r-- | docs/manual/mod/core.xml.de | 2 | ||||
-rw-r--r-- | docs/manual/mod/core.xml.es | 2 | ||||
-rw-r--r-- | docs/manual/mod/core.xml.fr | 2 | ||||
-rw-r--r-- | docs/manual/mod/core.xml.ja | 2 | ||||
-rw-r--r-- | docs/manual/mod/core.xml.tr | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_rewrite.html.en | 18 | ||||
-rw-r--r-- | docs/manual/mod/mod_rewrite.xml.fr | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_rewrite.xml.meta | 2 |
11 files changed, 52 insertions, 32 deletions
diff --git a/docs/manual/expr.html.en b/docs/manual/expr.html.en index 058a8ec311..11c54e192c 100644 --- a/docs/manual/expr.html.en +++ b/docs/manual/expr.html.en @@ -196,70 +196,72 @@ listfunction ::= listfuncname "<strong>(</strong>" word "<strong>)</strong>"</pr "<code>GET /index.html HTTP/1.1</code>")</td></tr> <tr class="odd"><td><code>REMOTE_ADDR</code></td> <td>The IP address of the remote host</td></tr> -<tr><td><code>REMOTE_HOST</code></td> +<tr><td><code>REMOTE_PORT</code></td> + <td>The port of the remote host</td></tr> +<tr class="odd"><td><code>REMOTE_HOST</code></td> <td>The host name of the remote host</td></tr> -<tr class="odd"><td><code>REMOTE_USER</code></td> +<tr><td><code>REMOTE_USER</code></td> <td>The name of the authenticated user, if any (not available during <code class="directive"><If></code>)</td></tr> -<tr><td><code>REMOTE_IDENT</code></td> +<tr class="odd"><td><code>REMOTE_IDENT</code></td> <td>The user name set by <code class="module"><a href="./mod/mod_ident.html">mod_ident</a></code></td></tr> -<tr class="odd"><td><code>SERVER_NAME</code></td> +<tr><td><code>SERVER_NAME</code></td> <td>The <code class="directive"><a href="./mod/core.html#servername">ServerName</a></code> of the current vhost</td></tr> -<tr><td><code>SERVER_PORT</code></td> +<tr class="odd"><td><code>SERVER_PORT</code></td> <td>The server port of the current vhost, see <code class="directive"><a href="./mod/core.html#servername">ServerName</a></code></td></tr> -<tr class="odd"><td><code>SERVER_ADMIN</code></td> +<tr><td><code>SERVER_ADMIN</code></td> <td>The <code class="directive"><a href="./mod/core.html#serveradmin">ServerAdmin</a></code> of the current vhost</td></tr> -<tr><td><code>SERVER_PROTOCOL</code></td> +<tr class="odd"><td><code>SERVER_PROTOCOL</code></td> <td>The protocol used by the request (e.g. HTTP/1.1). In some types of internal subrequests, this variable has the value <code>INCLUDED</code>.</td></tr> -<tr class="odd"><td><code>SERVER_PROTOCOL_VERSION</code></td> +<tr><td><code>SERVER_PROTOCOL_VERSION</code></td> <td>A number that encodes the HTTP version of the request: <code>1000 * major + minor</code>. For example, <code>1001</code> corresponds to HTTP/1.1 and <code>9</code> corresponds to HTTP/0.9</td></tr> -<tr><td><code>SERVER_PROTOCOL_VERSION_MAJOR</code></td> +<tr class="odd"><td><code>SERVER_PROTOCOL_VERSION_MAJOR</code></td> <td>The major version part of the HTTP version of the request, e.g. <code>1</code> for HTTP/1.0</td></tr> -<tr class="odd"><td><code>SERVER_PROTOCOL_VERSION_MINOR</code></td> +<tr><td><code>SERVER_PROTOCOL_VERSION_MINOR</code></td> <td>The minor version part of the HTTP version of the request, e.g. <code>0</code> for HTTP/1.0</td></tr> -<tr><td><code>DOCUMENT_ROOT</code></td> +<tr class="odd"><td><code>DOCUMENT_ROOT</code></td> <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> +<tr><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> -<tr><td><code>CONTENT_TYPE</code></td> +<tr class="odd"><td><code>CONTENT_TYPE</code></td> <td>The content type of the response (not available during <code class="directive"><If></code>)</td></tr> -<tr class="odd"><td><code>HANDLER</code></td> +<tr><td><code>HANDLER</code></td> <td>The name of the <a href="handler.html">handler</a> creating the response</td></tr> -<tr><td><code>HTTP2</code></td> +<tr class="odd"><td><code>HTTP2</code></td> <td>"<code>on</code>" if the request uses http/2, "<code>off</code>" otherwise</td></tr> -<tr class="odd"><td><code>HTTPS</code></td> +<tr><td><code>HTTPS</code></td> <td>"<code>on</code>" if the request uses https, "<code>off</code>" otherwise</td></tr> -<tr><td><code>IPV6</code></td> +<tr class="odd"><td><code>IPV6</code></td> <td>"<code>on</code>" if the connection uses IPv6, "<code>off</code>" otherwise</td></tr> -<tr class="odd"><td><code>REQUEST_STATUS</code></td> +<tr><td><code>REQUEST_STATUS</code></td> <td>The HTTP error status of the request (not available during <code class="directive"><If></code>)</td></tr> -<tr><td><code>REQUEST_LOG_ID</code></td> +<tr class="odd"><td><code>REQUEST_LOG_ID</code></td> <td>The error log id of the request (see <code class="directive"><a href="./mod/core.html#errorlogformat">ErrorLogFormat</a></code>)</td></tr> -<tr class="odd"><td><code>CONN_LOG_ID</code></td> +<tr><td><code>CONN_LOG_ID</code></td> <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> +<tr class="odd"><td><code>CONN_REMOTE_ADDR</code></td> <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> -<tr class="odd"><td><code>CONTEXT_PREFIX</code></td> +<tr><td><code>CONTEXT_PREFIX</code></td> <td /></tr> -<tr><td><code>CONTEXT_DOCUMENT_ROOT</code></td> +<tr class="odd"><td><code>CONTEXT_DOCUMENT_ROOT</code></td> <td /></tr> </table> diff --git a/docs/manual/expr.xml.fr b/docs/manual/expr.xml.fr index 9a244980cb..c401bc9a47 100644 --- a/docs/manual/expr.xml.fr +++ b/docs/manual/expr.xml.fr @@ -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: 1762013 --> +<!-- English Revision: 1762013:1776459 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/expr.xml.meta b/docs/manual/expr.xml.meta index d5a2e5e1a5..ea324a8bb2 100644 --- a/docs/manual/expr.xml.meta +++ b/docs/manual/expr.xml.meta @@ -8,6 +8,6 @@ <variants> <variant>en</variant> - <variant>fr</variant> + <variant outdated="yes">fr</variant> </variants> </metafile> diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de index 04c1dcff33..596389b638 100644 --- a/docs/manual/mod/core.xml.de +++ b/docs/manual/mod/core.xml.de @@ -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:1772560 (outdated) --> +<!-- English Revision: 344972:1776704 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/core.xml.es b/docs/manual/mod/core.xml.es index 80aef0ac75..e40848b1a1 100644 --- a/docs/manual/mod/core.xml.es +++ b/docs/manual/mod/core.xml.es @@ -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.es.xsl"?> -<!-- English Revision: 1741251:1772560 (outdated) --> +<!-- English Revision: 1741251:1776704 (outdated) --> <!-- Translated by Luis Gil de Bernabé Pfeiffer lgilbernabe[AT]apache.org --> <!-- Reviewed by Sergio Ramos--> <!-- diff --git a/docs/manual/mod/core.xml.fr b/docs/manual/mod/core.xml.fr index fa5f5d4467..829450174d 100644 --- a/docs/manual/mod/core.xml.fr +++ b/docs/manual/mod/core.xml.fr @@ -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: 1769718:1772560 (outdated) --> +<!-- English Revision: 1769718:1776704 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja index 0c4a65bcf3..e877dc8c1d 100644 --- a/docs/manual/mod/core.xml.ja +++ b/docs/manual/mod/core.xml.ja @@ -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:1772560 (outdated) --> +<!-- English Revision: 669847:1776704 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/core.xml.tr b/docs/manual/mod/core.xml.tr index ada01355a6..229f62cf91 100644 --- a/docs/manual/mod/core.xml.tr +++ b/docs/manual/mod/core.xml.tr @@ -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: 1302855:1772560 (outdated) --> +<!-- English Revision: 1302855:1776704 (outdated) --> <!-- ===================================================== Translated by: Nilgün Belma Bugüner <nilgun belgeler.org> Reviewed by: Orhan Berent <berent belgeler.org> diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en index 740af257ef..0d16c8d12c 100644 --- a/docs/manual/mod/mod_rewrite.html.en +++ b/docs/manual/mod/mod_rewrite.html.en @@ -1019,6 +1019,24 @@ RewriteRule "^/$" "/homepage.std.html" [L]</pre> 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.26, 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.26 and later.</p> + </dd> + </dl> </div> diff --git a/docs/manual/mod/mod_rewrite.xml.fr b/docs/manual/mod/mod_rewrite.xml.fr index f0fa430831..7f19e618d3 100644 --- a/docs/manual/mod/mod_rewrite.xml.fr +++ b/docs/manual/mod/mod_rewrite.xml.fr @@ -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: 1760590 --> +<!-- English Revision: 1760590:1776708 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/mod/mod_rewrite.xml.meta b/docs/manual/mod/mod_rewrite.xml.meta index decc0a7b1e..0be21e86f4 100644 --- a/docs/manual/mod/mod_rewrite.xml.meta +++ b/docs/manual/mod/mod_rewrite.xml.meta @@ -8,6 +8,6 @@ <variants> <variant>en</variant> - <variant>fr</variant> + <variant outdated="yes">fr</variant> </variants> </metafile> |