diff options
Diffstat (limited to 'docs/manual/mod')
100 files changed, 625 insertions, 625 deletions
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index 1f60fc16d9..7ff7cc614c 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -3192,8 +3192,8 @@ resource </td></tr> <tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>2.4.10 and later</td></tr> </table> <p>This directive controls whether HTTP trailers are copied into the - internal representation of HTTP headers. This mergeing occurs when the - request body has been completely consumed, long after most header + internal representation of HTTP headers. This mergeing occurs when the + request body has been completely consumed, long after most header processing would have a chance to examine or modify request headers.</p> <p>This option is provided for compatibility with releases prior to 2.4.10, where trailers were always merged.</p> @@ -3920,7 +3920,7 @@ to name-virtual hosts</td></tr> (nor for ServerName vs. ServerAlias). </p> <p>The complete list of names in the <code class="directive">VirtualHost</code> - directive are treated just like a (non wildcard) + directive are treated just like a (non wildcard) <code class="directive">ServerAlias</code>.</p> @@ -3966,7 +3966,7 @@ itself</td></tr> <p>If no <code class="directive">ServerName</code> is specified, then the server attempts to deduce the client visible hostname by performing a reverse lookup on an IP address of the systems hostname.</p> - + <p>If no port is specified in the <code class="directive">ServerName</code>, then the server will use the port from the incoming request. For optimal reliability and @@ -4317,7 +4317,7 @@ certain events before failing a request</td></tr> for an acknowledgement of a packet if the send buffer is full.</li> - <li>In <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> and <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code>, + <li>In <code class="module"><a href="../mod/mod_cgi.html">mod_cgi</a></code> and <code class="module"><a href="../mod/mod_cgid.html">mod_cgid</a></code>, the length of time to wait for output from a CGI script.</li> <li>In <code class="module"><a href="../mod/mod_ext_filter.html">mod_ext_filter</a></code>, the length of time to diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de index 0034c0e5ae..7ca2417ad3 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:1673917 (outdated) --> +<!-- English Revision: 344972:1673932 (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 9acd53faeb..f6a7d827f7 100644 --- a/docs/manual/mod/core.xml.es +++ b/docs/manual/mod/core.xml.es @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?> -<!-- English Revision: 1040494:1673917 (outdated) --> +<!-- English Revision: 1040494:1673932 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/core.xml.fr b/docs/manual/mod/core.xml.fr index fe87e5dadb..c3ca64d6b6 100644 --- a/docs/manual/mod/core.xml.fr +++ b/docs/manual/mod/core.xml.fr @@ -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: 1664071:1673917 (outdated) --> +<!-- English Revision: 1664071:1673932 (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 f061198bc8..06cb68e85f 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:1673917 (outdated) --> +<!-- English Revision: 669847:1673932 (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 90aa2d1ad5..cf31f92f7c 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:1673917 (outdated) --> +<!-- English Revision: 1302855:1673932 (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_access_compat.html.en b/docs/manual/mod/mod_access_compat.html.en index 9eaf18ffbe..a1ade2a7fa 100644 --- a/docs/manual/mod/mod_access_compat.html.en +++ b/docs/manual/mod/mod_access_compat.html.en @@ -72,7 +72,7 @@ have been deprecated by the new authz refactoring. Please see in a <code class="directive"><a href="../mod/core.html#limit"><Limit></a></code> section.</p> <div class="note"> <h3>Merging of configuration sections</h3> - <p>When any directive provided by this module is used in a new + <p>When any directive provided by this module is used in a new configuration section, no directives provided by this module are inherited from previous configuration sections.</p> </div> @@ -211,7 +211,7 @@ Allow from 2001:db8::a00:20ff:fea7:ccea/10</pre> others will be denied.</p> <div class="note"> <h3>Merging of configuration sections</h3> - <p>When any directive provided by this module is used in a new + <p>When any directive provided by this module is used in a new configuration section, no directives provided by this module are inherited from previous configuration sections.</p> </div> @@ -381,7 +381,7 @@ Deny from foo.example.org</pre> work</a>.</p> <div class="note"> <h3>Merging of configuration sections</h3> - <p>When any directive provided by this module is used in a new + <p>When any directive provided by this module is used in a new configuration section, no directives provided by this module are inherited from previous configuration sections.</p> </div> @@ -445,7 +445,7 @@ Satisfy Any</pre> be restricted to particular methods by <code class="directive"><a href="../mod/core.html#limit"><Limit></a></code> and <code class="directive"><a href="../mod/core.html#limitexcept"><LimitExcept></a></code> sections.</p> <div class="note"> <h3>Merging of configuration sections</h3> - <p>When any directive provided by this module is used in a new + <p>When any directive provided by this module is used in a new configuration section, no directives provided by this module are inherited from previous configuration sections.</p> </div> diff --git a/docs/manual/mod/mod_access_compat.xml b/docs/manual/mod/mod_access_compat.xml index 390bef2380..c16faf2baf 100644 --- a/docs/manual/mod/mod_access_compat.xml +++ b/docs/manual/mod/mod_access_compat.xml @@ -71,7 +71,7 @@ have been deprecated by the new authz refactoring. Please see in a <directive module="core" type="section">Limit</directive> section.</p> <note> <title>Merging of configuration sections</title> - <p>When any directive provided by this module is used in a new + <p>When any directive provided by this module is used in a new configuration section, no directives provided by this module are inherited from previous configuration sections.</p> </note> @@ -210,7 +210,7 @@ SetEnvIf User-Agent ^KnockKnock/2\.0 let_me_in others will be denied.</p> <note> <title>Merging of configuration sections</title> - <p>When any directive provided by this module is used in a new + <p>When any directive provided by this module is used in a new configuration section, no directives provided by this module are inherited from previous configuration sections.</p> </note> @@ -402,7 +402,7 @@ Deny from foo.example.org work</a>.</p> <note> <title>Merging of configuration sections</title> - <p>When any directive provided by this module is used in a new + <p>When any directive provided by this module is used in a new configuration section, no directives provided by this module are inherited from previous configuration sections.</p> </note> @@ -472,7 +472,7 @@ Satisfy Any >LimitExcept</directive> sections.</p> <note> <title>Merging of configuration sections</title> - <p>When any directive provided by this module is used in a new + <p>When any directive provided by this module is used in a new configuration section, no directives provided by this module are inherited from previous configuration sections.</p> </note> diff --git a/docs/manual/mod/mod_alias.html.en b/docs/manual/mod/mod_alias.html.en index 2eb10c5a1b..295c1f2d6d 100644 --- a/docs/manual/mod/mod_alias.html.en +++ b/docs/manual/mod/mod_alias.html.en @@ -52,7 +52,7 @@ a new location.</p> <p>When the <code class="directive"><a href="#alias">Alias</a></code>, - <code class="directive"><a href="#scriptalias">ScriptAlias</a></code> and + <code class="directive"><a href="#scriptalias">ScriptAlias</a></code> and <code class="directive"><a href="#redirect">Redirect</a></code> directives are used within a <code class="directive"><a href="../mod/core.html#location"><Location></a></code> or <code class="directive"><a href="../mod/core.html#locationmatch"><LocationMatch></a></code> @@ -116,13 +116,13 @@ Alias "/foo" "/gaq"</pre> ignored.</p> <p>When the <code class="directive"><a href="#alias">Alias</a></code>, - <code class="directive"><a href="#scriptalias">ScriptAlias</a></code> and + <code class="directive"><a href="#scriptalias">ScriptAlias</a></code> and <code class="directive"><a href="#redirect">Redirect</a></code> directives are used within a <code class="directive"><a href="../mod/core.html#location"><Location></a></code> or <code class="directive"><a href="../mod/core.html#locationmatch"><LocationMatch></a></code> section, these directives will take precedence over any globally defined <code class="directive"><a href="#alias">Alias</a></code>, - <code class="directive"><a href="#scriptalias">ScriptAlias</a></code> and + <code class="directive"><a href="#scriptalias">ScriptAlias</a></code> and <code class="directive"><a href="#redirect">Redirect</a></code> directives.</p> </div> @@ -184,7 +184,7 @@ Alias "/foo" "/gaq"</pre> </Directory></pre> - <p>Any number slashes in the <var>URL-path</var> parameter + <p>Any number slashes in the <var>URL-path</var> parameter matches any number of slashes in the requested URL-path.</p> <p>If the <code class="directive">Alias</code> directive is used within a diff --git a/docs/manual/mod/mod_alias.xml b/docs/manual/mod/mod_alias.xml index 37e7f71806..f967aebe6c 100644 --- a/docs/manual/mod/mod_alias.xml +++ b/docs/manual/mod/mod_alias.xml @@ -48,7 +48,7 @@ a new location.</p> <p>When the <directive module="mod_alias">Alias</directive>, - <directive module="mod_alias">ScriptAlias</directive> and + <directive module="mod_alias">ScriptAlias</directive> and <directive module="mod_alias">Redirect</directive> directives are used within a <directive type="section" module="core">Location</directive> or <directive type="section" module="core">LocationMatch</directive> @@ -100,13 +100,13 @@ Alias "/foo" "/gaq" ignored.</p> <p>When the <directive module="mod_alias">Alias</directive>, - <directive module="mod_alias">ScriptAlias</directive> and + <directive module="mod_alias">ScriptAlias</directive> and <directive module="mod_alias">Redirect</directive> directives are used within a <directive type="section" module="core">Location</directive> or <directive type="section" module="core">LocationMatch</directive> section, these directives will take precedence over any globally defined <directive module="mod_alias">Alias</directive>, - <directive module="mod_alias">ScriptAlias</directive> and + <directive module="mod_alias">ScriptAlias</directive> and <directive module="mod_alias">Redirect</directive> directives.</p> </section> @@ -175,7 +175,7 @@ Alias "/image" "/ftp/pub/image" </Directory> </highlight> - <p>Any number slashes in the <var>URL-path</var> parameter + <p>Any number slashes in the <var>URL-path</var> parameter matches any number of slashes in the requested URL-path.</p> <p>If the <directive>Alias</directive> directive is used within a @@ -613,4 +613,3 @@ ScriptAliasMatch "(?i)^/cgi-bin(.*)" "/usr/local/apache/cgi-bin$1" </directivesynopsis> </modulesynopsis> - diff --git a/docs/manual/mod/mod_allowmethods.xml b/docs/manual/mod/mod_allowmethods.xml index 3fe9a00276..f20f80c790 100644 --- a/docs/manual/mod/mod_allowmethods.xml +++ b/docs/manual/mod/mod_allowmethods.xml @@ -84,4 +84,3 @@ kludgy implementation of <directive module="core">Limit</directive> and </directivesynopsis> </modulesynopsis> - diff --git a/docs/manual/mod/mod_asis.html.fr b/docs/manual/mod/mod_asis.html.fr index 4251b5e992..310b653c21 100644 --- a/docs/manual/mod/mod_asis.html.fr +++ b/docs/manual/mod/mod_asis.html.fr @@ -29,6 +29,8 @@ <a href="../ja/mod/mod_asis.html" hreflang="ja" rel="alternate" title="Japanese"> ja </a> | <a href="../ko/mod/mod_asis.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p> </div> +<div class="outofdate">Cette traduction peut tre prime. Vrifiez la version + anglaise pour les changements rcents.</div> <table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Envoie des fichiers contenant leurs propres en-ttes HTTP</td></tr> <tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Base</td></tr> diff --git a/docs/manual/mod/mod_asis.xml.fr b/docs/manual/mod/mod_asis.xml.fr index c7763a839f..52cb6aebdf 100644 --- a/docs/manual/mod/mod_asis.xml.fr +++ b/docs/manual/mod/mod_asis.xml.fr @@ -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 : 1330911 --> +<!-- English Revision: 1330911:1673932 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/mod/mod_asis.xml.ja b/docs/manual/mod/mod_asis.xml.ja index c8e3052597..96f369ceb9 100644 --- a/docs/manual/mod/mod_asis.xml.ja +++ b/docs/manual/mod/mod_asis.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: 420990:1330911 (outdated) --> +<!-- English Revision: 420990:1673932 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/mod_asis.xml.ko b/docs/manual/mod/mod_asis.xml.ko index 2a658000f6..be69d0a253 100644 --- a/docs/manual/mod/mod_asis.xml.ko +++ b/docs/manual/mod/mod_asis.xml.ko @@ -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: 151408:1330911 (outdated) --> +<!-- English Revision: 151408:1673932 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/mod_asis.xml.meta b/docs/manual/mod/mod_asis.xml.meta index e8af141c7c..c71ecbde4a 100644 --- a/docs/manual/mod/mod_asis.xml.meta +++ b/docs/manual/mod/mod_asis.xml.meta @@ -8,7 +8,7 @@ <variants> <variant>en</variant> - <variant>fr</variant> + <variant outdated="yes">fr</variant> <variant outdated="yes">ja</variant> <variant outdated="yes">ko</variant> </variants> diff --git a/docs/manual/mod/mod_authn_socache.xml b/docs/manual/mod/mod_authn_socache.xml index e371841388..2edd5d6e4a 100644 --- a/docs/manual/mod/mod_authn_socache.xml +++ b/docs/manual/mod/mod_authn_socache.xml @@ -207,4 +207,3 @@ AuthnCacheProvideFor dbd myprovider </directivesynopsis> </modulesynopsis> - diff --git a/docs/manual/mod/mod_authnz_fcgi.html.en b/docs/manual/mod/mod_authnz_fcgi.html.en index 398d8129b8..f42396e313 100644 --- a/docs/manual/mod/mod_authnz_fcgi.html.en +++ b/docs/manual/mod/mod_authnz_fcgi.html.en @@ -41,7 +41,7 @@ httpd authentication and authorization</td></tr> authenticators and authorizors which participate in one or both phases.</p> - <p>FastCGI authorizers can authenticate using user id and password, + <p>FastCGI authorizers can authenticate using user id and password, such as for Basic authentication, or can authenticate using arbitrary mechanisms.</p> </div> @@ -68,7 +68,7 @@ and Access Control</a></li> <div class="section"> <h2><a name="invocations" id="invocations">Invocation modes</a></h2> - <p>The invocation modes for FastCGI authorizers supported by this + <p>The invocation modes for FastCGI authorizers supported by this module are distinguished by two characteristics, <em>type</em> and auth <em>mechanism</em>.</p> @@ -89,7 +89,7 @@ and Access Control</a></li> <dt><em>Type</em> <code>authn</code>, <em>mechanism</em> <code>AuthBasicProvider</code></dt> - <dd>In this mode, + <dd>In this mode, <code>FCGI_ROLE</code> is set to <code>AUTHORIZER</code> and <code>FCGI_APACHE_ROLE</code> is set to <code>AUTHENTICATOR</code>. The application must be defined as provider type <em>authn</em> @@ -140,7 +140,7 @@ while (FCGI::accept >= 0) { AUTHORIZER</code> and <code>FCGI_APACHE_ROLE</code> is set to <code>AUTHORIZER</code>. The application must be defined as provider type <em>authz</em> using <code class="directive"><a href="#authnzfcgidefineprovider"> - AuthnzFcgiDefineProvider</a></code>. When invoked, the application + AuthnzFcgiDefineProvider</a></code>. When invoked, the application is expected to authorize the client using the provided user id and other request data. Example application: <pre class="prettyprint lang-perl">#!/usr/bin/perl @@ -185,8 +185,8 @@ while (FCGI::accept >= 0) { using <code class="directive"><a href="#authnzfcgidefineprovider"> AuthnzFcgiDefineProvider</a></code>. The application is expected to handle both authentication and authorization in the same invocation - using the user id, password, and other request data. The invocation - occurs during the Apache httpd API authentication phase. If the + using the user id, password, and other request data. The invocation + occurs during the Apache httpd API authentication phase. If the application returns 200 and the same provider is invoked during the authorization phase (via <code class="directive">Require</code>), mod_authnz_fcgi will return success for the authorization phase without invoking the @@ -241,7 +241,7 @@ while (FCGI::accept >= 0) { die if $ENV{'FCGI_APACHE_ROLE'} ne "AUTHENTICATOR"; die if $ENV{'FCGI_ROLE'} ne "AUTHORIZER"; - # This authorizer assumes that the RequireBasicAuth option of + # This authorizer assumes that the RequireBasicAuth option of # AuthnzFcgiCheckAuthnProvider is On: die if !$ENV{'REMOTE_PASSWD'}; die if !$ENV{'REMOTE_USER'}; @@ -278,14 +278,14 @@ while (FCGI::accept >= 0) { </dd> </dl> - + </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> <div class="section"> <h2><a name="examples" id="examples">Additional examples</a></h2> <ol> <li>If your application supports the separate authentication and - authorization roles (<code>AUTHENTICATOR</code> and <code>AUTHORIZER</code>), define + authorization roles (<code>AUTHENTICATOR</code> and <code>AUTHORIZER</code>), define separate providers as follows, even if they map to the same application: @@ -293,7 +293,7 @@ while (FCGI::accept >= 0) { AuthnzFcgiDefineProvider authz FooAuthz fcgi://localhost:10102/</pre> - Specify the authn provider on + Specify the authn provider on <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code> and the authz provider on <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code>: @@ -305,7 +305,7 @@ Require FooAuthz</pre> </li> - <li>If your application supports the generic <code>AUTHORIZER</code> role + <li>If your application supports the generic <code>AUTHORIZER</code> role (authentication and authorizer in one invocation), define a single provider as follows: @@ -333,7 +333,7 @@ Require FooAuthnz</pre> <dt>Apache httpd access checker</dt> <dd>The Apache httpd API <em>access check</em> phase is a separate phase from authentication and authorization. Some other FastCGI - implementations implement this phase, which is denoted by the + implementations implement this phase, which is denoted by the setting of <code>FCGI_APACHE_ROLE</code> to <code>ACCESS_CHECKER</code>.</dd> <dt>Local (Unix) sockets or pipes</dt> @@ -355,7 +355,7 @@ Require FooAuthnz</pre> start them.</dd> <dt>AP_AUTH_INTERNAL_PER_URI</dt> - <dd>All providers are currently registered as + <dd>All providers are currently registered as AP_AUTH_INTERNAL_PER_CONF, which means that checks are not performed again for internal subrequests with the same access control configuration as the initial request.</dd> @@ -389,9 +389,9 @@ Require FooAuthnz</pre> <li>General messages for debugging are logged at log level <code>debug</code>.</li> <li>Environment variables passed to the application are - logged at log level <code>trace2</code>. The value of the + logged at log level <code>trace2</code>. The value of the <code>REMOTE_PASSWD</code> variable will be obscured, - but <strong>any other sensitive data will be visible in the + but <strong>any other sensitive data will be visible in the log</strong>.</li> <li>All I/O between the module and the FastCGI application, including all environment variables, will be logged in printable @@ -452,7 +452,7 @@ authentication hook.</td></tr> <dt><em>option</em></dt> <dd>The following options are supported: - + <dl> <dt>Authoritative On|Off (default On)</dt> <dd>This controls whether or not other modules are allowed @@ -479,7 +479,7 @@ authentication hook.</td></tr> evaluated after calling the authorizer, determines the user. The expression follows <a href="../expr.html"> ap_expr syntax</a> and must resolve to a string. A typical - use is to reference a <code>Variable-<em>XXX</em></code> + use is to reference a <code>Variable-<em>XXX</em></code> setting returned by the authorizer using an option like <code>UserExpr "%{reqenv:<em>XXX</em>}"</code>. If this option is specified and the user id can't be retrieved @@ -515,9 +515,9 @@ authentication and/or authorization</td></tr> <dt><em>provider-name</em></dt> <dd>This is used to assign a name to the provider which is - used in other directives such as + used in other directives such as <code class="directive"><a href="../mod/mod_auth_basic.html#authbasicprovider">AuthBasicProvider</a></code> - and + and <code class="directive"><a href="../mod/mod_authz_core.html#require">Require</a></code>.</dd> <dt><em>backend-address</em></dt> diff --git a/docs/manual/mod/mod_authnz_fcgi.xml b/docs/manual/mod/mod_authnz_fcgi.xml index 8430e6feb7..48d0392b28 100644 --- a/docs/manual/mod/mod_authnz_fcgi.xml +++ b/docs/manual/mod/mod_authnz_fcgi.xml @@ -38,7 +38,7 @@ httpd authentication and authorization</description> authenticators and authorizors which participate in one or both phases.</p> - <p>FastCGI authorizers can authenticate using user id and password, + <p>FastCGI authorizers can authenticate using user id and password, such as for Basic authentication, or can authenticate using arbitrary mechanisms.</p> </summary> @@ -51,7 +51,7 @@ and Access Control</a></seealso> <section id="invocations"><title>Invocation modes</title> - <p>The invocation modes for FastCGI authorizers supported by this + <p>The invocation modes for FastCGI authorizers supported by this module are distinguished by two characteristics, <em>type</em> and auth <em>mechanism</em>.</p> @@ -72,7 +72,7 @@ and Access Control</a></seealso> <dt><em>Type</em> <code>authn</code>, <em>mechanism</em> <code>AuthBasicProvider</code></dt> - <dd>In this mode, + <dd>In this mode, <code>FCGI_ROLE</code> is set to <code>AUTHORIZER</code> and <code>FCGI_APACHE_ROLE</code> is set to <code>AUTHENTICATOR</code>. The application must be defined as provider type <em>authn</em> @@ -125,7 +125,7 @@ AuthnzFcgiDefineProvider authn FooAuthn fcgi://localhost:10102/ AUTHORIZER</code> and <code>FCGI_APACHE_ROLE</code> is set to <code>AUTHORIZER</code>. The application must be defined as provider type <em>authz</em> using <directive module="mod_authnz_fcgi"> - AuthnzFcgiDefineProvider</directive>. When invoked, the application + AuthnzFcgiDefineProvider</directive>. When invoked, the application is expected to authorize the client using the provided user id and other request data. Example application: <highlight language="perl"> @@ -172,8 +172,8 @@ AuthnzFcgiDefineProvider authz FooAuthz fcgi://localhost:10103/ using <directive module="mod_authnz_fcgi"> AuthnzFcgiDefineProvider</directive>. The application is expected to handle both authentication and authorization in the same invocation - using the user id, password, and other request data. The invocation - occurs during the Apache httpd API authentication phase. If the + using the user id, password, and other request data. The invocation + occurs during the Apache httpd API authentication phase. If the application returns 200 and the same provider is invoked during the authorization phase (via <directive>Require</directive>), mod_authnz_fcgi will return success for the authorization phase without invoking the @@ -222,7 +222,7 @@ AuthnzFcgiDefineProvider authnz FooAuthnz fcgi://localhost:10103/ AUTHORIZER</code> and <code>FCGI_APACHE_ROLE</code> is set to <code>AUTHENTICATOR</code>. The application must be defined as provider type <em>authn</em> using <directive module="mod_authnz_fcgi"> - AuthnzFcgiDefineProvider</directive>. <directive + AuthnzFcgiDefineProvider</directive>. <directive module="mod_authnz_fcgi">AuthnzFcgiCheckAuthnProvider</directive> specifies when it is called. Example application: <highlight language="perl"> @@ -232,7 +232,7 @@ while (FCGI::accept >= 0) { die if $ENV{'FCGI_APACHE_ROLE'} ne "AUTHENTICATOR"; die if $ENV{'FCGI_ROLE'} ne "AUTHORIZER"; - # This authorizer assumes that the RequireBasicAuth option of + # This authorizer assumes that the RequireBasicAuth option of # AuthnzFcgiCheckAuthnProvider is On: die if !$ENV{'REMOTE_PASSWD'}; die if !$ENV{'REMOTE_USER'}; @@ -270,14 +270,14 @@ AuthnzFcgiDefineProvider authn FooAuthn fcgi://localhost:10103/ </dd> </dl> - + </section> <section id="examples"><title>Additional examples</title> <ol> <li>If your application supports the separate authentication and - authorization roles (<code>AUTHENTICATOR</code> and <code>AUTHORIZER</code>), define + authorization roles (<code>AUTHENTICATOR</code> and <code>AUTHORIZER</code>), define separate providers as follows, even if they map to the same application: @@ -286,7 +286,7 @@ AuthnzFcgiDefineProvider authn FooAuthn fcgi://localhost:10102/ AuthnzFcgiDefineProvider authz FooAuthz fcgi://localhost:10102/ </highlight> - Specify the authn provider on + Specify the authn provider on <directive module="mod_auth_basic">AuthBasicProvider</directive> and the authz provider on <directive module="mod_authz_core">Require</directive>: @@ -299,7 +299,7 @@ Require FooAuthz </highlight> </li> - <li>If your application supports the generic <code>AUTHORIZER</code> role + <li>If your application supports the generic <code>AUTHORIZER</code> role (authentication and authorizer in one invocation), define a single provider as follows: @@ -329,7 +329,7 @@ Require FooAuthnz <dt>Apache httpd access checker</dt> <dd>The Apache httpd API <em>access check</em> phase is a separate phase from authentication and authorization. Some other FastCGI - implementations implement this phase, which is denoted by the + implementations implement this phase, which is denoted by the setting of <code>FCGI_APACHE_ROLE</code> to <code>ACCESS_CHECKER</code>.</dd> <dt>Local (Unix) sockets or pipes</dt> @@ -351,7 +351,7 @@ Require FooAuthnz start them.</dd> <dt>AP_AUTH_INTERNAL_PER_URI</dt> - <dd>All providers are currently registered as + <dd>All providers are currently registered as AP_AUTH_INTERNAL_PER_CONF, which means that checks are not performed again for internal subrequests with the same access control configuration as the initial request.</dd> @@ -385,9 +385,9 @@ Require FooAuthnz <li>General messages for debugging are logged at log level <code>debug</code>.</li> <li>Environment variables passed to the application are - logged at log level <code>trace2</code>. The value of the + logged at log level <code>trace2</code>. The value of the <code>REMOTE_PASSWD</code> variable will be obscured, - but <strong>any other sensitive data will be visible in the + but <strong>any other sensitive data will be visible in the log</strong>.</li> <li>All I/O between the module and the FastCGI application, including all environment variables, will be logged in printable @@ -426,9 +426,9 @@ authentication and/or authorization</description> <dt><em>provider-name</em></dt> <dd>This is used to assign a name to the provider which is - used in other directives such as + used in other directives such as <directive module="mod_auth_basic">AuthBasicProvider</directive> - and + and <directive module="mod_authz_core">Require</directive>.</dd> <dt><em>backend-address</em></dt> @@ -482,7 +482,7 @@ authentication hook.</description> <dt><em>option</em></dt> <dd>The following options are supported: - + <dl> <dt>Authoritative On|Off (default On)</dt> <dd>This controls whether or not other modules are allowed @@ -509,7 +509,7 @@ authentication hook.</description> evaluated after calling the authorizer, determines the user. The expression follows <a href="../expr.html"> ap_expr syntax</a> and must resolve to a string. A typical - use is to reference a <code>Variable-<em>XXX</em></code> + use is to reference a <code>Variable-<em>XXX</em></code> setting returned by the authorizer using an option like <code>UserExpr "%{reqenv:<em>XXX</em>}"</code>. If this option is specified and the user id can't be retrieved diff --git a/docs/manual/mod/mod_authnz_ldap.html.en b/docs/manual/mod/mod_authnz_ldap.html.en index 465ec9b022..268b5fa0db 100644 --- a/docs/manual/mod/mod_authnz_ldap.html.en +++ b/docs/manual/mod/mod_authnz_ldap.html.en @@ -1160,8 +1160,8 @@ evaluated before the user search is discontinued.</td></tr> <div class="note"><h3>Nested groups performance</h3> <p> When <code class="directive">AuthLDAPSubGroupAttribute</code> overlaps with <code class="directive">AuthLDAPGroupAttribute</code> (as it does by default and - as required by common LDAP schemas), uncached searching for subgroups in - large groups can be very slow. If you use large, non-nested groups, keep + as required by common LDAP schemas), uncached searching for subgroups in + large groups can be very slow. If you use large, non-nested groups, keep <code class="directive">AuthLDAPMaxSubGroupDepth</code> set to zero.</p> </div> @@ -1188,7 +1188,7 @@ query to set the REMOTE_USER environment variable</td></tr> directive is useful should you want people to log into a website using an email address, but a backend application expects the username as a userid.</p> - <p> This directive only has effect when this module is used for + <p> This directive only has effect when this module is used for authentication.</p> </div> diff --git a/docs/manual/mod/mod_authnz_ldap.xml.fr b/docs/manual/mod/mod_authnz_ldap.xml.fr index b96164631e..dfd13f3d39 100644 --- a/docs/manual/mod/mod_authnz_ldap.xml.fr +++ b/docs/manual/mod/mod_authnz_ldap.xml.fr @@ -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: 1643416:1673582 (outdated) --> +<!-- English Revision: 1643416:1673932 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/mod/mod_autoindex.html.en b/docs/manual/mod/mod_autoindex.html.en index 4e649e2165..20206a6c3b 100644 --- a/docs/manual/mod/mod_autoindex.html.en +++ b/docs/manual/mod/mod_autoindex.html.en @@ -71,7 +71,7 @@ same header repeatedly toggles between ascending and descending order. These column header links are suppressed with the <code class="directive"><a href="#indexoptions">IndexOptions</a></code> directive's - <code><a href="#indexoptions.suppresscolumnsorting">SuppressColumnSorting</a></code> + <code><a href="#indexoptions.suppresscolumnsorting">SuppressColumnSorting</a></code> option.</p> <p>Note that when the display is sorted by "Size", it's the @@ -328,7 +328,7 @@ AddDescription "My friend Marshall" friends/mars.gif</pre> <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 + which would normally only be used in htaccess context, are implicitly prefixed with '*/' to avoid matching partial directory names.</p> </div> @@ -658,7 +658,7 @@ indexing</td></tr> <code>FoldersFirst</code> is enabled, subdirectory <code>Zed</code> will be listed before subdirectory <code>Beta</code>, which will be listed before normal files - <code>Gamma</code> and <code>Alpha</code>. + <code>Gamma</code> and <code>Alpha</code>. <strong>This option only has an effect if <a href="#indexoptions.fancyindexing"><code>FancyIndexing</code></a> is also enabled.</strong> </dd> @@ -685,7 +685,7 @@ indexing</td></tr> to wait until all the images have been loaded. If no value is given for the option, it defaults to the standard height of the icons supplied with the Apache httpd software. - + <strong>This option only has an effect if <a href="#indexoptions.fancyindexing"><code>FancyIndexing</code></a> is also enabled.</strong> @@ -763,7 +763,7 @@ indexing</td></tr> space to use for something else. See <code class="directive"><a href="#adddescription">AddDescription</a></code> for information about setting the file description. See also the <code><a href="#indexoptions.descriptionwidth">DescriptionWidth</a></code> index option to limit the size of the description column. - + <strong>This option only has an effect if <a href="#indexoptions.fancyindexing"><code>FancyIndexing</code></a> is also enabled.</strong> </dd> @@ -797,7 +797,7 @@ indexing</td></tr> <dd>This will suppress the display of the last modification date, in fancy indexing listings. - + <strong>This option only has an effect if <a href="#indexoptions.fancyindexing"><code>FancyIndexing</code></a> is also enabled.</strong> </dd> @@ -811,7 +811,7 @@ indexing</td></tr> by the final specification prohibits <code>img</code> and <code>hr</code> elements from the <code>pre</code> block (used to format FancyIndexed listings.) - + <strong>This option only has an effect if <a href="#indexoptions.fancyindexing"><code>FancyIndexing</code></a> is also enabled.</strong> @@ -820,7 +820,7 @@ indexing</td></tr> <dt><a name="indexoptions.suppresssize" id="indexoptions.suppresssize">SuppressSize</a></dt> <dd>This will suppress the file size in fancy indexing listings. - + <strong>This option only has an effect if <a href="#indexoptions.fancyindexing"><code>FancyIndexing</code></a> is also enabled.</strong> </dd> diff --git a/docs/manual/mod/mod_autoindex.xml b/docs/manual/mod/mod_autoindex.xml index 9898bc8722..55e2c9fdd0 100644 --- a/docs/manual/mod/mod_autoindex.xml +++ b/docs/manual/mod/mod_autoindex.xml @@ -69,7 +69,7 @@ same header repeatedly toggles between ascending and descending order. These column header links are suppressed with the <directive module="mod_autoindex">IndexOptions</directive> directive's - <code><a href="#indexoptions.suppresscolumnsorting">SuppressColumnSorting</a></code> + <code><a href="#indexoptions.suppresscolumnsorting">SuppressColumnSorting</a></code> option.</p> <p>Note that when the display is sorted by "Size", it's the @@ -320,7 +320,7 @@ AddDescription "My friend Marshall" friends/mars.gif <note><title>Arguments with path information</title> <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 + which would normally only be used in htaccess context, are implicitly prefixed with '*/' to avoid matching partial directory names.</p> </note> @@ -666,8 +666,8 @@ indexing</description> <code>FoldersFirst</code> is enabled, subdirectory <code>Zed</code> will be listed before subdirectory <code>Beta</code>, which will be listed before normal files - <code>Gamma</code> and <code>Alpha</code>. - <strong>This option only has an effect if <a + <code>Gamma</code> and <code>Alpha</code>. + <strong>This option only has an effect if <a href="#indexoptions.fancyindexing"><code>FancyIndexing</code></a> is also enabled.</strong> </dd> @@ -698,7 +698,7 @@ indexing</description> to wait until all the images have been loaded. If no value is given for the option, it defaults to the standard height of the icons supplied with the Apache httpd software. - + <strong>This option only has an effect if <a href="#indexoptions.fancyindexing" ><code>FancyIndexing</code></a> is also enabled.</strong> @@ -793,7 +793,7 @@ indexing</description> description. See also the <code><a href="#indexoptions.descriptionwidth">DescriptionWidth</a></code> index option to limit the size of the description column. - + <strong>This option only has an effect if <a href="#indexoptions.fancyindexing" ><code>FancyIndexing</code></a> is also enabled.</strong> @@ -834,7 +834,7 @@ indexing</description> <dd>This will suppress the display of the last modification date, in fancy indexing listings. - + <strong>This option only has an effect if <a href="#indexoptions.fancyindexing" ><code>FancyIndexing</code></a> is also enabled.</strong> @@ -850,7 +850,7 @@ indexing</description> by the final specification prohibits <code>img</code> and <code>hr</code> elements from the <code>pre</code> block (used to format FancyIndexed listings.) - + <strong>This option only has an effect if <a href="#indexoptions.fancyindexing" ><code>FancyIndexing</code></a> is also enabled.</strong> @@ -861,7 +861,7 @@ indexing</description> id="indexoptions.suppresssize">SuppressSize</a></dt> <dd>This will suppress the file size in fancy indexing listings. - + <strong>This option only has an effect if <a href="#indexoptions.fancyindexing" ><code>FancyIndexing</code></a> is also enabled.</strong> @@ -1058,7 +1058,7 @@ Name|Date|Size|Description</syntax> following classes are associated with the various parts of the listing:</p> - <table border="1" style="zebra"> + <table border="1" style="zebra"> <tr><th>Class</th><th>Definition</th></tr> <tr><td>tr.indexhead</td><td>Header row of listing</td></tr> <tr><td>th.indexcolicon and td.indexcolicon</td> <td>Icon column</td></tr> diff --git a/docs/manual/mod/mod_cache.html.en b/docs/manual/mod/mod_cache.html.en index 5440db4af0..71a1122396 100644 --- a/docs/manual/mod/mod_cache.html.en +++ b/docs/manual/mod/mod_cache.html.en @@ -181,7 +181,7 @@ LoadModule cache_module modules/mod_cache.so CacheDirLevels 5 CacheDirLength 3 </IfModule> - + # When acting as a proxy, don't cache the list of security updates CacheDisable http://security.update.server/update-list/ </IfModule></pre> @@ -473,7 +473,7 @@ manager</td></tr> <code class="directive"><LocationMatch></code> sections are processed before globally defined <code class="directive">CacheEnable</code> directives.</p> - <p>When acting as a forward proxy server, <var>url-string</var> must + <p>When acting as a forward proxy server, <var>url-string</var> must minimally begin with a protocol for which caching should be enabled.</p> <pre class="prettyprint lang-config"># Cache content (normal handler only) @@ -570,7 +570,7 @@ CacheHeader on</pre> <code class="directive">CacheIgnoreCacheControl</code> directive allows this behavior to be overridden. <code class="directive">CacheIgnoreCacheControl On</code> tells the server to attempt to serve the resource from the cache even - if the request contains no-cache header values.</p> + if the request contains no-cache header values.</p> <pre class="prettyprint lang-config">CacheIgnoreCacheControl On</pre> @@ -842,7 +842,7 @@ CacheLock on</pre> </table> <p>The <code class="directive">CacheLockPath</code> directive allows you to specify the directory in which the locks are created. If <var>directory</var> is not an absolute - path, the location specified will be relative to the value of + path, the location specified will be relative to the value of <code class="directive"><a href="../mod/core.html#defaultruntimedir">DefaultRuntimeDir</a></code>.</p> </div> diff --git a/docs/manual/mod/mod_cache.xml b/docs/manual/mod/mod_cache.xml index e6bf98bf11..8afde7fc0d 100644 --- a/docs/manual/mod/mod_cache.xml +++ b/docs/manual/mod/mod_cache.xml @@ -162,7 +162,7 @@ LoadModule cache_module modules/mod_cache.so CacheDirLevels 5 CacheDirLength 3 </IfModule> - + # When acting as a proxy, don't cache the list of security updates CacheDisable http://security.update.server/update-list/ </IfModule> @@ -374,7 +374,7 @@ manager</description> <directive type="section">LocationMatch</directive> sections are processed before globally defined <directive>CacheEnable</directive> directives.</p> - <p>When acting as a forward proxy server, <var>url-string</var> must + <p>When acting as a forward proxy server, <var>url-string</var> must minimally begin with a protocol for which caching should be enabled.</p> <highlight language="config"> @@ -570,7 +570,7 @@ header.</description> <directive>CacheIgnoreCacheControl</directive> directive allows this behavior to be overridden. <directive>CacheIgnoreCacheControl On</directive> tells the server to attempt to serve the resource from the cache even - if the request contains no-cache header values.</p> + if the request contains no-cache header values.</p> <highlight language="config"> CacheIgnoreCacheControl On @@ -877,7 +877,7 @@ CacheLock on <usage> <p>The <directive>CacheLockPath</directive> directive allows you to specify the directory in which the locks are created. If <var>directory</var> is not an absolute - path, the location specified will be relative to the value of + path, the location specified will be relative to the value of <directive module="core">DefaultRuntimeDir</directive>.</p> </usage> </directivesynopsis> diff --git a/docs/manual/mod/mod_cern_meta.html.fr b/docs/manual/mod/mod_cern_meta.html.fr index 12847614d8..6d698a54c1 100644 --- a/docs/manual/mod/mod_cern_meta.html.fr +++ b/docs/manual/mod/mod_cern_meta.html.fr @@ -28,6 +28,8 @@ <a href="../fr/mod/mod_cern_meta.html" title="Franais"> fr </a> | <a href="../ko/mod/mod_cern_meta.html" hreflang="ko" rel="alternate" title="Korean"> ko </a></p> </div> +<div class="outofdate">Cette traduction peut tre prime. Vrifiez la version + anglaise pour les changements rcents.</div> <table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>La smantique des mtafichiers du serveur httpd du CERN</td></tr> <tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Extension</td></tr> diff --git a/docs/manual/mod/mod_cern_meta.xml.fr b/docs/manual/mod/mod_cern_meta.xml.fr index e52b0df00d..d360901961 100644 --- a/docs/manual/mod/mod_cern_meta.xml.fr +++ b/docs/manual/mod/mod_cern_meta.xml.fr @@ -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 : 1336590 --> +<!-- English Revision: 1336590:1673932 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/mod/mod_cern_meta.xml.ko b/docs/manual/mod/mod_cern_meta.xml.ko index 16bd7d801e..096cc749a7 100644 --- a/docs/manual/mod/mod_cern_meta.xml.ko +++ b/docs/manual/mod/mod_cern_meta.xml.ko @@ -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: 420990:1336590 (outdated) --> +<!-- English Revision: 420990:1673932 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/mod_cern_meta.xml.meta b/docs/manual/mod/mod_cern_meta.xml.meta index 8a68d26e7d..92cdd1bb65 100644 --- a/docs/manual/mod/mod_cern_meta.xml.meta +++ b/docs/manual/mod/mod_cern_meta.xml.meta @@ -8,7 +8,7 @@ <variants> <variant>en</variant> - <variant>fr</variant> + <variant outdated="yes">fr</variant> <variant outdated="yes">ko</variant> </variants> </metafile> diff --git a/docs/manual/mod/mod_deflate.html.en b/docs/manual/mod/mod_deflate.html.en index 6f71c94152..6a1b064b12 100644 --- a/docs/manual/mod/mod_deflate.html.en +++ b/docs/manual/mod/mod_deflate.html.en @@ -193,36 +193,36 @@ SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip</pre> <h2><a name="precompressed" id="precompressed">Serving pre-compressed content</a></h2> - <p>Since <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> re-compresses content each + <p>Since <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code> re-compresses content each time a request is made, some performance benefit can be derived by pre-compressing the content and telling mod_deflate to serve them without re-compressing them. This may be accomplished using a configuration like the following:</p> <pre class="prettyprint lang-config"><IfModule mod_headers.c> - # Serve gzip compressed CSS files if they exist + # Serve gzip compressed CSS files if they exist # and the client accepts gzip. - RewriteCond %{HTTP:Accept-encoding} gzip - RewriteCond %{REQUEST_FILENAME}\.gz -s - RewriteRule ^(.*)\.css $1\.css\.gz [QSA] + RewriteCond "%{HTTP:Accept-encoding}" "gzip" + RewriteCond "%{REQUEST_FILENAME}\.gz" "-s" + RewriteRule "^(.*)\.css" "$1\.css\.gz" [QSA] - # Serve gzip compressed JS files if they exist + # Serve gzip compressed JS files if they exist # and the client accepts gzip. - RewriteCond %{HTTP:Accept-encoding} gzip - RewriteCond %{REQUEST_FILENAME}\.gz -s - RewriteRule ^(.*)\.js $1\.js\.gz [QSA] + RewriteCond "%{HTTP:Accept-encoding}" "gzip" + RewriteCond "%{REQUEST_FILENAME}\.gz" "-s" + RewriteRule "^(.*)\.js" "$1\.js\.gz" [QSA] # Serve correct content types, and prevent mod_deflate double gzip. - RewriteRule \.css\.gz$ - [T=text/css,E=no-gzip:1] - RewriteRule \.js\.gz$ - [T=text/javascript,E=no-gzip:1] + RewriteRule "\.css\.gz$" "-" [T=text/css,E=no-gzip:1] + RewriteRule "\.js\.gz$" "-" [T=text/javascript,E=no-gzip:1] <FilesMatch "(\.js\.gz|\.css\.gz)$"> # Serve correct encoding type. Header append Content-Encoding gzip - # Force proxies to cache gzipped & + # Force proxies to cache gzipped & # non-gzipped css/js files separately. Header append Vary Accept-Encoding </FilesMatch> @@ -244,18 +244,18 @@ content</a></h2> how the ETag hader should be altered when a response is compressed.</p> <dl> <dt>AddSuffix</dt> - <dd><p>Append the compression method onto the end of the ETag, causing - compressed and uncompressed representations to have unique ETags. - This has been the default since 2.4.0, but prevents serving - "HTTP Not Modified" (304) responses to conditional requests for + <dd><p>Append the compression method onto the end of the ETag, causing + compressed and uncompressed representations to have unique ETags. + This has been the default since 2.4.0, but prevents serving + "HTTP Not Modified" (304) responses to conditional requests for compressed content.</p></dd> <dt>NoChange</dt> <dd><p>Don't change the ETag on a compressed response. This was the default prior to 2.4.0, but does not satisfy the HTTP/1.1 property that all representations of the same resource have unique ETags. </p></dd> <dt>Remove</dt> - <dd><p>Remove the ETag header from compressed responses. This prevents - some conditional requests from being possible, but avoids the + <dd><p>Remove the ETag header from compressed responses. This prevents + some conditional requests from being possible, but avoids the shortcomings of the preceding options. </p></dd> </dl> @@ -308,7 +308,7 @@ content</a></h2> adding the value to your <a href="../logs.html#accesslog">access log</a>.</p> <div class="example"><h3>Example</h3><pre class="prettyprint lang-config"> DeflateFilterNote ratio - + LogFormat '"%r" %b (%{ratio}n) "%{User-agent}i"' deflate CustomLog logs/deflate_log deflate</pre> </div> @@ -356,7 +356,7 @@ CustomLog logs/deflate_log deflate</pre> <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_deflate</td></tr> <tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>2.4.10 and later</td></tr> </table> - <p>The <code class="directive">DeflateInflateLimitRequestBody</code> directive + <p>The <code class="directive">DeflateInflateLimitRequestBody</code> directive specifies the maximum size of an inflated request body. If it is unset, <code class="directive"><a href="../mod/core.html#limitrequestbody">LimitRequestBody</a></code> is applied to the inflated body.</p> @@ -365,7 +365,7 @@ CustomLog logs/deflate_log deflate</pre> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> <div class="directive-section"><h2><a name="DeflateInflateRatioBurst" id="DeflateInflateRatioBurst">DeflateInflateRatioBurst</a> <a name="deflateinflateratioburst" id="deflateinflateratioburst">Directive</a></h2> <table class="directive"> -<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maximum number of times the inflation ratio for request bodies +<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Maximum number of times the inflation ratio for request bodies can be crossed</td></tr> <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DeflateInflateRatioBurst <var>value</var></code></td></tr> <tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>3</code></td></tr> @@ -374,9 +374,9 @@ CustomLog logs/deflate_log deflate</pre> <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_deflate</td></tr> <tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>2.4.10 and later</td></tr> </table> - <p>The <code class="directive">DeflateInflateRatioBurst</code> directive - specifies the maximum number of times the - <code class="directive">DeflateInflateRatioLimit</code> can be crossed before + <p>The <code class="directive">DeflateInflateRatioBurst</code> directive + specifies the maximum number of times the + <code class="directive">DeflateInflateRatioLimit</code> can be crossed before terminating the request.</p> </div> @@ -391,10 +391,10 @@ CustomLog logs/deflate_log deflate</pre> <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_deflate</td></tr> <tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>2.4.10 and later</td></tr> </table> - <p>The <code class="directive">DeflateInflateRatioLimit</code> directive - specifies the maximum ratio of deflated to inflated size of an + <p>The <code class="directive">DeflateInflateRatioLimit</code> directive + specifies the maximum ratio of deflated to inflated size of an inflated request body. This ratio is checked as the body is - streamed in, and if crossed more than + streamed in, and if crossed more than <code class="directive">DeflateInflateRatioBurst</code> times, the request will be terminated.</p> diff --git a/docs/manual/mod/mod_deflate.html.ja.utf8 b/docs/manual/mod/mod_deflate.html.ja.utf8 index 2bad7efdca..df6f3b9c71 100644 --- a/docs/manual/mod/mod_deflate.html.ja.utf8 +++ b/docs/manual/mod/mod_deflate.html.ja.utf8 @@ -373,7 +373,7 @@ <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> <div class="directive-section"><h2><a name="DeflateInflateRatioBurst" id="DeflateInflateRatioBurst">DeflateInflateRatioBurst</a> <a name="deflateinflateratioburst" id="deflateinflateratioburst">ディレクティブ</a></h2> <table class="directive"> -<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Maximum number of times the inflation ratio for request bodies +<tr><th><a href="directive-dict.html#Description">説明:</a></th><td>Maximum number of times the inflation ratio for request bodies can be crossed</td></tr> <tr><th><a href="directive-dict.html#Syntax">構文:</a></th><td><code>DeflateInflateRatioBurst <var>value</var></code></td></tr> <tr><th><a href="directive-dict.html#Default">デフォルト:</a></th><td><code>3</code></td></tr> diff --git a/docs/manual/mod/mod_deflate.html.ko.euc-kr b/docs/manual/mod/mod_deflate.html.ko.euc-kr index 43d6d85fc4..8ff6334efd 100644 --- a/docs/manual/mod/mod_deflate.html.ko.euc-kr +++ b/docs/manual/mod/mod_deflate.html.ko.euc-kr @@ -363,7 +363,7 @@ <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> <div class="directive-section"><h2><a name="DeflateInflateRatioBurst" id="DeflateInflateRatioBurst">DeflateInflateRatioBurst</a> <a name="deflateinflateratioburst" id="deflateinflateratioburst">þ</a></h2> <table class="directive"> -<tr><th><a href="directive-dict.html#Description">:</a></th><td>Maximum number of times the inflation ratio for request bodies +<tr><th><a href="directive-dict.html#Description">:</a></th><td>Maximum number of times the inflation ratio for request bodies can be crossed</td></tr> <tr><th><a href="directive-dict.html#Syntax">:</a></th><td><code>DeflateInflateRatioBurst <var>value</var></code></td></tr> <tr><th><a href="directive-dict.html#Default">⺻:</a></th><td><code>3</code></td></tr> diff --git a/docs/manual/mod/mod_deflate.xml b/docs/manual/mod/mod_deflate.xml index d13988422e..49749bac6e 100644 --- a/docs/manual/mod/mod_deflate.xml +++ b/docs/manual/mod/mod_deflate.xml @@ -68,7 +68,7 @@ client</description> <highlight language="config"> SetOutputFilter DEFLATE -SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip +SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip </highlight> <p>If you want to restrict the compression to particular MIME types @@ -181,7 +181,7 @@ SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip <section id="precompressed"><title>Serving pre-compressed content</title> - <p>Since <module>mod_deflate</module> re-compresses content each + <p>Since <module>mod_deflate</module> re-compresses content each time a request is made, some performance benefit can be derived by pre-compressing the content and telling mod_deflate to serve them without re-compressing them. This may be accomplished using a @@ -189,29 +189,29 @@ content</title> <highlight language="config"> <IfModule mod_headers.c> - # Serve gzip compressed CSS files if they exist + # Serve gzip compressed CSS files if they exist # and the client accepts gzip. - RewriteCond %{HTTP:Accept-encoding} gzip - RewriteCond %{REQUEST_FILENAME}\.gz -s - RewriteRule ^(.*)\.css $1\.css\.gz [QSA] + RewriteCond "%{HTTP:Accept-encoding}" "gzip" + RewriteCond "%{REQUEST_FILENAME}\.gz" "-s" + RewriteRule "^(.*)\.css" "$1\.css\.gz" [QSA] - # Serve gzip compressed JS files if they exist + # Serve gzip compressed JS files if they exist # and the client accepts gzip. - RewriteCond %{HTTP:Accept-encoding} gzip - RewriteCond %{REQUEST_FILENAME}\.gz -s - RewriteRule ^(.*)\.js $1\.js\.gz [QSA] + RewriteCond "%{HTTP:Accept-encoding}" "gzip" + RewriteCond "%{REQUEST_FILENAME}\.gz" "-s" + RewriteRule "^(.*)\.js" "$1\.js\.gz" [QSA] # Serve correct content types, and prevent mod_deflate double gzip. - RewriteRule \.css\.gz$ - [T=text/css,E=no-gzip:1] - RewriteRule \.js\.gz$ - [T=text/javascript,E=no-gzip:1] + RewriteRule "\.css\.gz$" "-" [T=text/css,E=no-gzip:1] + RewriteRule "\.js\.gz$" "-" [T=text/javascript,E=no-gzip:1] <FilesMatch "(\.js\.gz|\.css\.gz)$"> # Serve correct encoding type. Header append Content-Encoding gzip - # Force proxies to cache gzipped & + # Force proxies to cache gzipped & # non-gzipped css/js files separately. Header append Vary Accept-Encoding </FilesMatch> @@ -238,7 +238,7 @@ content</title> <example><title>Example</title> <highlight language="config"> DeflateFilterNote ratio - + LogFormat '"%r" %b (%{ratio}n) "%{User-agent}i"' deflate CustomLog logs/deflate_log deflate </highlight> @@ -353,18 +353,18 @@ CustomLog logs/deflate_log deflate how the ETag hader should be altered when a response is compressed.</p> <dl> <dt>AddSuffix</dt> - <dd><p>Append the compression method onto the end of the ETag, causing - compressed and uncompressed representations to have unique ETags. - This has been the default since 2.4.0, but prevents serving - "HTTP Not Modified" (304) responses to conditional requests for + <dd><p>Append the compression method onto the end of the ETag, causing + compressed and uncompressed representations to have unique ETags. + This has been the default since 2.4.0, but prevents serving + "HTTP Not Modified" (304) responses to conditional requests for compressed content.</p></dd> <dt>NoChange</dt> <dd><p>Don't change the ETag on a compressed response. This was the default prior to 2.4.0, but does not satisfy the HTTP/1.1 property that all representations of the same resource have unique ETags. </p></dd> <dt>Remove</dt> - <dd><p>Remove the ETag header from compressed responses. This prevents - some conditional requests from being possible, but avoids the + <dd><p>Remove the ETag header from compressed responses. This prevents + some conditional requests from being possible, but avoids the shortcomings of the preceding options. </p></dd> </dl> </usage> @@ -380,7 +380,7 @@ CustomLog logs/deflate_log deflate <compatibility>2.4.10 and later</compatibility> <usage> - <p>The <directive>DeflateInflateLimitRequestBody</directive> directive + <p>The <directive>DeflateInflateLimitRequestBody</directive> directive specifies the maximum size of an inflated request body. If it is unset, <directive module="core">LimitRequestBody</directive> is applied to the inflated body.</p> @@ -397,10 +397,10 @@ CustomLog logs/deflate_log deflate <compatibility>2.4.10 and later</compatibility> <usage> - <p>The <directive>DeflateInflateRatioLimit</directive> directive - specifies the maximum ratio of deflated to inflated size of an + <p>The <directive>DeflateInflateRatioLimit</directive> directive + specifies the maximum ratio of deflated to inflated size of an inflated request body. This ratio is checked as the body is - streamed in, and if crossed more than + streamed in, and if crossed more than <directive>DeflateInflateRatioBurst</directive> times, the request will be terminated.</p> </usage> @@ -408,7 +408,7 @@ CustomLog logs/deflate_log deflate <directivesynopsis> <name>DeflateInflateRatioBurst</name> -<description>Maximum number of times the inflation ratio for request bodies +<description>Maximum number of times the inflation ratio for request bodies can be crossed</description> <syntax>DeflateInflateRatioBurst <var>value</var></syntax> <default>3</default> @@ -417,12 +417,11 @@ CustomLog logs/deflate_log deflate <compatibility>2.4.10 and later</compatibility> <usage> - <p>The <directive>DeflateInflateRatioBurst</directive> directive - specifies the maximum number of times the - <directive>DeflateInflateRatioLimit</directive> can be crossed before + <p>The <directive>DeflateInflateRatioBurst</directive> directive + specifies the maximum number of times the + <directive>DeflateInflateRatioLimit</directive> can be crossed before terminating the request.</p> </usage> </directivesynopsis> </modulesynopsis> - diff --git a/docs/manual/mod/mod_deflate.xml.fr b/docs/manual/mod/mod_deflate.xml.fr index c016d24be1..8bf98ceaf5 100644 --- a/docs/manual/mod/mod_deflate.xml.fr +++ b/docs/manual/mod/mod_deflate.xml.fr @@ -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: 1655917:1673892 (outdated) --> +<!-- English Revision: 1655917:1673930 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/mod/mod_deflate.xml.ja b/docs/manual/mod/mod_deflate.xml.ja index b6480babaf..65bba7d667 100644 --- a/docs/manual/mod/mod_deflate.xml.ja +++ b/docs/manual/mod/mod_deflate.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: 420990:1673892 (outdated) --> +<!-- English Revision: 420990:1673930 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/mod_deflate.xml.ko b/docs/manual/mod/mod_deflate.xml.ko index 2353fc11dd..86a896705d 100644 --- a/docs/manual/mod/mod_deflate.xml.ko +++ b/docs/manual/mod/mod_deflate.xml.ko @@ -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: 151408:1673892 (outdated) --> +<!-- English Revision: 151408:1673930 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/mod_dialup.xml b/docs/manual/mod/mod_dialup.xml index fa2e2c3e47..6e51130515 100644 --- a/docs/manual/mod/mod_dialup.xml +++ b/docs/manual/mod/mod_dialup.xml @@ -69,4 +69,3 @@ once the timer hits. From there the handler can continue to send data to the cl </directivesynopsis> </modulesynopsis> - diff --git a/docs/manual/mod/mod_dir.html.en b/docs/manual/mod/mod_dir.html.en index d591bf0571..161503d6f0 100644 --- a/docs/manual/mod/mod_dir.html.en +++ b/docs/manual/mod/mod_dir.html.en @@ -82,18 +82,18 @@ <tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in 2.4.8 and later. Releases prior to 2.4 implicitly act as if "DirectoryCheckHandler ON" was specified.</td></tr> </table> - <p>The <code class="directive">DirectoryCheckHandler</code> directive determines + <p>The <code class="directive">DirectoryCheckHandler</code> directive determines whether <code class="module"><a href="../mod/mod_dir.html">mod_dir</a></code> should check for directory indexes or add trailing slashes when some other handler has been configured for - the current URL. Handlers can be set by directives such as - <code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code> or by other modules at + the current URL. Handlers can be set by directives such as + <code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code> or by other modules at runtime. </p> <p> In releases prior to 2.4, this module did not take any action if any - other handler was configured for a URL. This allows directory indexes to - be served even when a <code class="directive">SetHandler</code> directive is + other handler was configured for a URL. This allows directory indexes to + be served even when a <code class="directive">SetHandler</code> directive is specified for an entire directory, but it can also result in some conflicts - with other modules.</p> + with other modules.</p> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> diff --git a/docs/manual/mod/mod_dir.xml b/docs/manual/mod/mod_dir.xml index 9cb283bf38..72901398e9 100644 --- a/docs/manual/mod/mod_dir.xml +++ b/docs/manual/mod/mod_dir.xml @@ -287,18 +287,18 @@ later</compatibility> <compatibility>Available in 2.4.8 and later. Releases prior to 2.4 implicitly act as if "DirectoryCheckHandler ON" was specified.</compatibility> <usage> - <p>The <directive>DirectoryCheckHandler</directive> directive determines + <p>The <directive>DirectoryCheckHandler</directive> directive determines whether <module>mod_dir</module> should check for directory indexes or add trailing slashes when some other handler has been configured for - the current URL. Handlers can be set by directives such as - <directive module="core">SetHandler</directive> or by other modules at + the current URL. Handlers can be set by directives such as + <directive module="core">SetHandler</directive> or by other modules at runtime. </p> <p> In releases prior to 2.4, this module did not take any action if any - other handler was configured for a URL. This allows directory indexes to - be served even when a <directive>SetHandler</directive> directive is + other handler was configured for a URL. This allows directory indexes to + be served even when a <directive>SetHandler</directive> directive is specified for an entire directory, but it can also result in some conflicts - with other modules.</p> + with other modules.</p> </usage> </directivesynopsis> diff --git a/docs/manual/mod/mod_ext_filter.html.en b/docs/manual/mod/mod_ext_filter.html.en index 579e299483..65f0b5046e 100644 --- a/docs/manual/mod/mod_ext_filter.html.en +++ b/docs/manual/mod/mod_ext_filter.html.en @@ -90,7 +90,7 @@ ExtFilterDefine c-to-html mode=output \ # core directive to cause the new filter to # be run on output SetOutputFilter c-to-html - + # mod_mime directive to set the type of .c # files to text/c AddType text/c .c @@ -107,11 +107,11 @@ ExtFilterDefine c-to-html mode=output \ ExtFilterDefine gzip mode=output cmd=/bin/gzip <Location "/gzipped"> - + # core directive to cause the gzip filter to be # run on output SetOutputFilter gzip - + # mod_headers directive to add # "Content-Encoding: gzip" header field Header set Content-Encoding gzip diff --git a/docs/manual/mod/mod_ext_filter.xml b/docs/manual/mod/mod_ext_filter.xml index 325caf1b54..94b74337a3 100644 --- a/docs/manual/mod/mod_ext_filter.xml +++ b/docs/manual/mod/mod_ext_filter.xml @@ -73,7 +73,7 @@ ExtFilterDefine c-to-html mode=output \ # core directive to cause the new filter to # be run on output SetOutputFilter c-to-html - + # mod_mime directive to set the type of .c # files to text/c AddType text/c .c @@ -91,11 +91,11 @@ ExtFilterDefine c-to-html mode=output \ ExtFilterDefine gzip mode=output cmd=/bin/gzip <Location "/gzipped"> - + # core directive to cause the gzip filter to be # run on output SetOutputFilter gzip - + # mod_headers directive to add # "Content-Encoding: gzip" header field Header set Content-Encoding gzip diff --git a/docs/manual/mod/mod_filter.html.en b/docs/manual/mod/mod_filter.html.en index 8ce6750ac7..d94245c193 100644 --- a/docs/manual/mod/mod_filter.html.en +++ b/docs/manual/mod/mod_filter.html.en @@ -388,10 +388,10 @@ being moved to <code class="module"><a href="../mod/mod_filter.html">mod_filter< With two arguments it applies to a <var>filter-name</var> whenever the filter runs <em>any</em> provider.</p> - <p>Flags specified with this directive are merged with the flags - that underlying providers may have registerd with + <p>Flags specified with this directive are merged with the flags + that underlying providers may have registerd with <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code>. For example, a filter may internally specify - the equivalent of <code>change=yes</code>, but a particular + the equivalent of <code>change=yes</code>, but a particular configuration of the module can override with <code>change=no</code>. </p> @@ -399,7 +399,7 @@ being moved to <code class="module"><a href="../mod/mod_filter.html">mod_filter< <dl> <dt><code>change=yes|no</code></dt> - <dd>Specifies whether the filter changes the content, including possibly + <dd>Specifies whether the filter changes the content, including possibly the content length. The "no" argument is supported in 2.4.7 and later.</dd> <dt><code>change=1:1</code></dt> diff --git a/docs/manual/mod/mod_imagemap.xml.ko b/docs/manual/mod/mod_imagemap.xml.ko index 780fb59d0e..748f5f0ce9 100644 --- a/docs/manual/mod/mod_imagemap.xml.ko +++ b/docs/manual/mod/mod_imagemap.xml.ko @@ -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: 151408:1432444 (outdated) --> +<!-- English Revision: 151408:1673932 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/mod_journald.html.en b/docs/manual/mod/mod_journald.html.en index edecf4898b..dd0038d183 100644 --- a/docs/manual/mod/mod_journald.html.en +++ b/docs/manual/mod/mod_journald.html.en @@ -74,10 +74,10 @@ <p>These variables can be for example used to show only log messages for particular URI using <code>journalctl</code>: </p> - + <pre class="prettyprint lang-">journalctl REQUEST_URI=/index.html -a</pre> - + <p>For more examples, see systemd-journalctl documentation.</p> </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> <div class="section"> @@ -88,7 +88,7 @@ instead of a filename enables logging via systemd-journald(8) if the system supports it. </p> - + <pre class="prettyprint lang-config">ErrorLog journald</pre> diff --git a/docs/manual/mod/mod_journald.xml b/docs/manual/mod/mod_journald.xml index 7133cae9da..696c0d67e0 100644 --- a/docs/manual/mod/mod_journald.xml +++ b/docs/manual/mod/mod_journald.xml @@ -61,9 +61,9 @@ <p>These variables can be for example used to show only log messages for particular URI using <code>journalctl</code>: </p> - + <highlight>journalctl REQUEST_URI=/index.html -a</highlight> - + <p>For more examples, see systemd-journalctl documentation.</p> </section> @@ -74,7 +74,7 @@ instead of a filename enables logging via systemd-journald(8) if the system supports it. </p> - + <highlight language="config"> ErrorLog journald </highlight> diff --git a/docs/manual/mod/mod_ldap.html.en b/docs/manual/mod/mod_ldap.html.en index 7042c21c01..8336ea43df 100644 --- a/docs/manual/mod/mod_ldap.html.en +++ b/docs/manual/mod/mod_ldap.html.en @@ -473,7 +473,7 @@ LDAPTrustedGlobalCert CA_BASE64 /certs/cacert2.pem connection pool. The default value of -1, and any other negative value, allows connections of any age to be reused.</p> - <p>For performance reasons, the reference time used by this directive is + <p>For performance reasons, the reference time used by this directive is based on when the LDAP connection is returned to the pool, not the time of the last successful I/O with the LDAP server. </p> @@ -482,7 +482,7 @@ LDAPTrustedGlobalCert CA_BASE64 /certs/cacert2.pem time is not updated if no backend LDAP conncetions were needed. Second, the reference time uses the time the HTTP request was received instead of the time the request is completed.</p> - + <div class="note"><p>This timeout defaults to units of seconds, but accepts suffixes for milliseconds (ms), minutes (min), and hours (h). </p></div> @@ -680,11 +680,11 @@ valid</td></tr> <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr> <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_ldap</td></tr> </table> - <p>Specifies the path of the shared memory cache file. If not set, + <p>Specifies the path of the shared memory cache file. If not set, anonymous shared memory will be used if the platform supports it.</p> <p>If <var>file-path</var> is not an absolute path, the location specified - will be relative to the value of + will be relative to the value of <code class="directive"><a href="../mod/core.html#defaultruntimedir">DefaultRuntimeDir</a></code>.</p> </div> diff --git a/docs/manual/mod/mod_ldap.xml b/docs/manual/mod/mod_ldap.xml index 6362eeb8a8..0df854593e 100644 --- a/docs/manual/mod/mod_ldap.xml +++ b/docs/manual/mod/mod_ldap.xml @@ -421,11 +421,11 @@ LDAPTrustedGlobalCert CA_BASE64 /certs/cacert2.pem <contextlist><context>server config</context></contextlist> <usage> - <p>Specifies the path of the shared memory cache file. If not set, + <p>Specifies the path of the shared memory cache file. If not set, anonymous shared memory will be used if the platform supports it.</p> <p>If <var>file-path</var> is not an absolute path, the location specified - will be relative to the value of + will be relative to the value of <directive module="core">DefaultRuntimeDir</directive>.</p> </usage> </directivesynopsis> @@ -757,7 +757,7 @@ connection client certificates.</description> connection pool. The default value of -1, and any other negative value, allows connections of any age to be reused.</p> - <p>For performance reasons, the reference time used by this directive is + <p>For performance reasons, the reference time used by this directive is based on when the LDAP connection is returned to the pool, not the time of the last successful I/O with the LDAP server. </p> @@ -766,7 +766,7 @@ connection client certificates.</description> time is not updated if no backend LDAP conncetions were needed. Second, the reference time uses the time the HTTP request was received instead of the time the request is completed.</p> - + <note><p>This timeout defaults to units of seconds, but accepts suffixes for milliseconds (ms), minutes (min), and hours (h). </p></note> diff --git a/docs/manual/mod/mod_log_config.html.en b/docs/manual/mod/mod_log_config.html.en index e50da0275f..333c3b49e8 100644 --- a/docs/manual/mod/mod_log_config.html.en +++ b/docs/manual/mod/mod_log_config.html.en @@ -308,9 +308,9 @@ <div class="note"> <p>Note: The '^' character at the start of three-character formats - has no significance, but it must be the first character of any newly - added three-character format to avoid potential conflicts with log - formats that use literals adjacent to a format specifier, such as + has no significance, but it must be the first character of any newly + added three-character format to avoid potential conflicts with log + formats that use literals adjacent to a format specifier, such as "%Dus".</p> </div> @@ -510,7 +510,7 @@ CustomLog referer.log referer env=!localreferer</pre> <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">LogFormat "%v %h %l %u %t \"%r\" %>s %b" vhost_common</pre> </div> - + </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> diff --git a/docs/manual/mod/mod_log_config.xml b/docs/manual/mod/mod_log_config.xml index 2b86c0d21f..ea097a6c4c 100644 --- a/docs/manual/mod/mod_log_config.xml +++ b/docs/manual/mod/mod_log_config.xml @@ -344,9 +344,9 @@ <note> <p>Note: The '^' character at the start of three-character formats - has no significance, but it must be the first character of any newly - added three-character format to avoid potential conflicts with log - formats that use literals adjacent to a format specifier, such as + has no significance, but it must be the first character of any newly + added three-character format to avoid potential conflicts with log + formats that use literals adjacent to a format specifier, such as "%Dus".</p> </note> @@ -554,7 +554,7 @@ CustomLog referer.log referer env=!localreferer LogFormat "%v %h %l %u %t \"%r\" %>s %b" vhost_common </highlight> </example> - + </usage> </directivesynopsis> diff --git a/docs/manual/mod/mod_lua.html.en b/docs/manual/mod/mod_lua.html.en index c9f540645e..4e945c43ab 100644 --- a/docs/manual/mod/mod_lua.html.en +++ b/docs/manual/mod/mod_lua.html.en @@ -51,9 +51,9 @@ at any time, even between stable releases of the 2.4.x series. Be sure to check the CHANGES file before upgrading.</div> <div class="warning"><h3>Warning</h3> -<p>This module holds a great deal of power over httpd, which is both a -strength and a potential security risk. It is <strong>not</strong> recommended -that you use this module on a server that is shared with users you do not +<p>This module holds a great deal of power over httpd, which is both a +strength and a potential security risk. It is <strong>not</strong> recommended +that you use this module on a server that is shared with users you do not trust, as it can be abused to change the internal workings of httpd.</p> </div> @@ -252,26 +252,26 @@ performing access control, or setting mime types:</p> <tr> <td>Quick handler</td> <td><code class="directive"><a href="#luaquickhandler">LuaQuickHandler</a></code></td> - <td>This is the first hook that will be called after a request has + <td>This is the first hook that will be called after a request has been mapped to a host or virtual host</td> </tr> <tr class="odd"> <td>Translate name</td> <td><code class="directive"><a href="#luahooktranslatename">LuaHookTranslateName</a></code></td> - <td>This phase translates the requested URI into a filename on the + <td>This phase translates the requested URI into a filename on the system. Modules such as <code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code> and <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> operate in this phase.</td> </tr> <tr> <td>Map to storage</td> <td><code class="directive"><a href="#luahookmaptostorage">LuaHookMapToStorage</a></code></td> - <td>This phase maps files to their physical, cached or external/proxied storage. + <td>This phase maps files to their physical, cached or external/proxied storage. It can be used by proxy or caching modules</td> </tr> <tr class="odd"> <td>Check Access</td> <td><code class="directive"><a href="#luahookaccesschecker">LuaHookAccessChecker</a></code></td> - <td>This phase checks whether a client has access to a resource. This + <td>This phase checks whether a client has access to a resource. This phase is run before the user is authenticated, so beware. </td> </tr> @@ -282,41 +282,41 @@ performing access control, or setting mime types:</p> </tr> <tr class="odd"> <td>Check Authorization</td> - <td><code class="directive"><a href="#luahookauthchecker">LuaHookAuthChecker</a></code> or + <td><code class="directive"><a href="#luahookauthchecker">LuaHookAuthChecker</a></code> or <code class="directive"><a href="#luaauthzprovider">LuaAuthzProvider</a></code></td> - <td>This phase authorizes a user based on the negotiated credentials, such as + <td>This phase authorizes a user based on the negotiated credentials, such as user ID, client certificate etc. </td> </tr> <tr> <td>Check Type</td> <td><code class="directive"><a href="#luahooktypechecker">LuaHookTypeChecker</a></code></td> - <td>This phase checks the requested file and assigns a content type and + <td>This phase checks the requested file and assigns a content type and a handler to it</td> </tr> <tr class="odd"> <td>Fixups</td> <td><code class="directive"><a href="#luahookfixups">LuaHookFixups</a></code></td> - <td>This is the final "fix anything" phase before the content handlers + <td>This is the final "fix anything" phase before the content handlers are run. Any last-minute changes to the request should be made here.</td> </tr> <tr> <td>Content handler</td> <td>fx. <code>.lua</code> files or through <code class="directive"><a href="#luamaphandler">LuaMapHandler</a></code></td> - <td>This is where the content is handled. Files are read, parsed, some are run, + <td>This is where the content is handled. Files are read, parsed, some are run, and the result is sent to the client</td> </tr> <tr class="odd"> <td>Logging</td> <td><code class="directive"><a href="#luahooklog">LuaHookLog</a></code></td> - <td>Once a request has been handled, it enters several logging phases, + <td>Once a request has been handled, it enters several logging phases, which logs the request in either the error or access log. Mod_lua is able to hook into the start of this and control logging output.</td> </tr> </table> -<p>Hook functions are passed the request object as their only argument -(except for LuaAuthzProvider, which also gets passed the arguments from +<p>Hook functions are passed the request object as their only argument +(except for LuaAuthzProvider, which also gets passed the arguments from the Require directive). They can return any value, depending on the hook, but most commonly they'll return OK, DONE, or DECLINED, which you can write in Lua as @@ -391,21 +391,21 @@ end</pre> <td><code>ap_auth_type</code></td> <td>string</td> <td>no</td> - <td>If an authentication check was made, this is set to the type + <td>If an authentication check was made, this is set to the type of authentication (f.x. <code>basic</code>)</td> </tr> <tr> <td><code>args</code></td> <td>string</td> <td>yes</td> - <td>The query string arguments extracted from the request + <td>The query string arguments extracted from the request (f.x. <code>foo=bar&name=johnsmith</code>)</td> </tr> <tr class="odd"> <td><code>assbackwards</code></td> <td>boolean</td> <td>no</td> - <td>Set to true if this is an HTTP/0.9 style request + <td>Set to true if this is an HTTP/0.9 style request (e.g. <code>GET /foo</code> (with no headers) )</td> </tr> <tr> @@ -442,7 +442,7 @@ end</pre> <td><code>content_type</code></td> <td>string</td> <td>yes</td> - <td>The content type of the current request, as determined in the + <td>The content type of the current request, as determined in the type_check phase (f.x. <code>image/gif</code> or <code>text/html</code>)</td> </tr> <tr> @@ -474,18 +474,18 @@ end</pre> <td><code>filename</code></td> <td>string</td> <td>yes</td> - <td>The file name that the request maps to, f.x. /www/example.com/foo.txt. This can be - changed in the translate-name or map-to-storage phases of a request to allow the + <td>The file name that the request maps to, f.x. /www/example.com/foo.txt. This can be + changed in the translate-name or map-to-storage phases of a request to allow the default handler (or script handlers) to serve a different file than what was requested.</td> </tr> <tr class="odd"> <td><code>handler</code></td> <td>string</td> <td>yes</td> - <td>The name of the <a href="../handler.html">handler</a> that should serve this request, f.x. - <code>lua-script</code> if it is to be served by mod_lua. This is typically set by the - <code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code> or <code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code> - directives, but could also be set via mod_lua to allow another handler to serve up a specific request + <td>The name of the <a href="../handler.html">handler</a> that should serve this request, f.x. + <code>lua-script</code> if it is to be served by mod_lua. This is typically set by the + <code class="directive"><a href="../mod/mod_mime.html#addhandler">AddHandler</a></code> or <code class="directive"><a href="../mod/core.html#sethandler">SetHandler</a></code> + directives, but could also be set via mod_lua to allow another handler to serve up a specific request that would otherwise not be served by it. </td> </tr> @@ -493,7 +493,7 @@ end</pre> <td><code>headers_in</code></td> <td>table</td> <td>yes</td> - <td>MIME header environment from the request. This contains headers such as <code>Host, + <td>MIME header environment from the request. This contains headers such as <code>Host, User-Agent, Referer</code> and so on.</td> </tr> <tr class="odd"> @@ -572,7 +572,7 @@ end</pre> <td><code>proxyreq</code></td> <td>string</td> <td>yes</td> - <td>Denotes whether this is a proxy request or not. This value is generally set in + <td>Denotes whether this is a proxy request or not. This value is generally set in the post_read_request/translate_name phase of a request.</td> </tr> <tr> @@ -684,7 +684,7 @@ if use_sendfile_thing then end</pre> -<pre class="prettyprint lang-lua">r:parseargs() -- returns two tables; one standard key/value table for regular GET data, +<pre class="prettyprint lang-lua">r:parseargs() -- returns two tables; one standard key/value table for regular GET data, -- and one for multi-value data (fx. foo=1&foo=2&foo=3): local GET, GETMULTI = r:parseargs() @@ -693,9 +693,9 @@ r:puts("Your name is: " .. GET['name'] or "Unknown")</pre> <pre class="prettyprint lang-lua">r:parsebody([sizeLimit]) -- parse the request body as a POST and return two lua tables, -- just like r:parseargs(). - -- An optional number may be passed to specify the maximum number + -- An optional number may be passed to specify the maximum number -- of bytes to parse. Default is 8192 bytes: - + local POST, POSTMULTI = r:parsebody(1024*1024) r:puts("Your name is: " .. POST['name'] or "Unknown")</pre> @@ -780,7 +780,7 @@ r:puts("Server 1's thread 1 has thread ID " .. thread.tid .. " and is in " .. th <pre class="prettyprint lang-lua">r:requestbody(filename) -- Reads and returns the request body of a request. -- If 'filename' is specified, it instead saves the -- contents to that file: - + local input = r:requestbody() r:puts("You sent the following request body to me:\n") r:puts(input)</pre> @@ -806,11 +806,11 @@ for k, module in pairs(r:loaded_modules()) do end</pre> -<pre class="prettyprint lang-lua">r:runtime_dir_relative(filename) -- Compute the name of a run-time file (e.g., shared memory "file") +<pre class="prettyprint lang-lua">r:runtime_dir_relative(filename) -- Compute the name of a run-time file (e.g., shared memory "file") -- relative to the appropriate run-time directory.</pre> -<pre class="prettyprint lang-lua">r:server_info() -- Returns a table containing server information, such as +<pre class="prettyprint lang-lua">r:server_info() -- Returns a table containing server information, such as -- the name of the httpd executable file, mpm used etc.</pre> @@ -830,9 +830,9 @@ end</pre> <pre class="prettyprint lang-lua">r.strcmp_match(string, pattern) -- Checks if 'string' matches 'pattern' using strcmp_match (globs). -- fx. whether 'www.example.com' matches '*.example.com': - + local match = r.strcmp_match("foobar.com", "foo*.com") -if match then +if match then r:puts("foobar.com matches foo*.com") end</pre> @@ -849,7 +849,7 @@ end</pre> <pre class="prettyprint lang-lua">r:custom_response(status_code, string) -- Construct and set a custom response for a given status code. -- This works much like the ErrorDocument directive: - + r:custom_response(404, "Baleted!")</pre> @@ -896,12 +896,12 @@ local matches = r:regex("FOO bar BAz", [[(foo) bar]], 1) <pre class="prettyprint lang-lua">r:ivm_set("key", value) -- Set an Inter-VM variable to hold a specific value. -- These values persist even though the VM is gone or not being used, -- and so should only be used if MaxConnectionsPerChild is > 0 - -- Values can be numbers, strings and booleans, and are stored on a + -- Values can be numbers, strings and booleans, and are stored on a -- per process basis (so they won't do much good with a prefork mpm) - + r:ivm_get("key") -- Fetches a variable set by ivm_set. Returns the contents of the variable -- if it exists or nil if no such variable exists. - + -- An example getter/setter that saves a global variable outside the VM: function handle(r) -- First VM to call this will get no value, and will have to create it @@ -1063,10 +1063,10 @@ local line = r:wsread()</pre> <h2><a name="modifying_buckets" id="modifying_buckets">Modifying contents with Lua filters</a></h2> <p> - Filter functions implemented via <code class="directive"><a href="#luainputfilter">LuaInputFilter</a></code> - or <code class="directive"><a href="#luaoutputfilter">LuaOutputFilter</a></code> are designed as - three-stage non-blocking functions using coroutines to suspend and resume a - function as buckets are sent down the filter chain. The core structure of + Filter functions implemented via <code class="directive"><a href="#luainputfilter">LuaInputFilter</a></code> + or <code class="directive"><a href="#luaoutputfilter">LuaOutputFilter</a></code> are designed as + three-stage non-blocking functions using coroutines to suspend and resume a + function as buckets are sent down the filter chain. The core structure of such a function is: </p> <pre class="prettyprint lang-lua">function filter(r) @@ -1077,11 +1077,11 @@ local line = r:wsread()</pre> return -- This would skip this filter. end -- Regardless of whether we have data to prepend, a yield MUST be called here. - -- Note that only output filters can prepend data. Input filters must use the + -- Note that only output filters can prepend data. Input filters must use the -- final stage to append data to the content. coroutine.yield([optional header to be prepended to the content]) - - -- After we have yielded, buckets will be sent to us, one by one, and we can + + -- After we have yielded, buckets will be sent to us, one by one, and we can -- do whatever we want with them and then pass on the result. -- Buckets are stored in the global variable 'bucket', so we create a loop -- that checks if 'bucket' is not nil: @@ -1090,9 +1090,9 @@ local line = r:wsread()</pre> coroutine.yield(output) -- Return our new content to the filter chain end - -- Once the buckets are gone, 'bucket' is set to nil, which will exit the + -- Once the buckets are gone, 'bucket' is set to nil, which will exit the -- loop and land us here. Anything extra we want to append to the content - -- can be done by doing a final yield here. Both input and output filters + -- can be done by doing a final yield here. Both input and output filters -- can append data to the content in this phase. coroutine.yield([optional footer to be appended to the content]) end</pre> @@ -1169,7 +1169,7 @@ local connected = database:active()</pre> <h3><a name="result_sets" id="result_sets">Working with result sets</a></h3> - <p>The result set returned by <code>db:select</code> or by the prepared statement functions + <p>The result set returned by <code>db:select</code> or by the prepared statement functions created through <code>db:prepare</code> can be used to fetch rows synchronously or asynchronously, depending on the row number specified:<br /> <code>result(0)</code> fetches all rows in a synchronous manner, returning a table of rows.<br /> @@ -1184,7 +1184,7 @@ local row = result(-1) -- Fetch the next available row, asynchronously local row = result(1234) -- Fetch row number 1234, asynchronously local row = result(-1, true) -- Fetch the next available row, using row names as key indexes.</pre> - <p>One can construct a function that returns an iterative function to iterate over all rows + <p>One can construct a function that returns an iterative function to iterate over all rows in a synchronous or asynchronous way, depending on the async argument: </p> <pre class="prettyprint lang-lua">function rows(resultset, async) @@ -1225,8 +1225,8 @@ end</pre> <p>Database handles should be closed using <code>database:close()</code> when they are no longer - needed. If you do not close them manually, they will eventually be garbage collected and - closed by mod_lua, but you may end up having too many unused connections to the database + needed. If you do not close them manually, they will eventually be garbage collected and + closed by mod_lua, but you may end up having too many unused connections to the database if you leave the closing up to mod_lua. Essentially, the following two measures are the same: </p> @@ -1242,11 +1242,11 @@ collectgarbage() -- close the handle via GC</pre> <h3><a name="database_caveat" id="database_caveat">Precautions when working with databases</a></h3> - <p>Although the standard <code>query</code> and <code>run</code> functions are freely - available, it is recommended that you use prepared statements whenever possible, to - both optimize performance (if your db handle lives on for a long time) and to minimize + <p>Although the standard <code>query</code> and <code>run</code> functions are freely + available, it is recommended that you use prepared statements whenever possible, to + both optimize performance (if your db handle lives on for a long time) and to minimize the risk of SQL injection attacks. <code>run</code> and <code>query</code> should only - be used when there are no variables inserted into a statement (a static statement). + be used when there are no variables inserted into a statement (a static statement). When using dynamic statements, use <code>db:prepare</code> or <code>db:prepared</code>. </p> @@ -1324,7 +1324,7 @@ LuaCodeCache never</pre> </table> <p>Add your hook to the access_checker phase. An access checker hook function usually returns OK, DECLINED, or HTTP_FORBIDDEN.</p> - <div class="note"><h3>Ordering</h3><p>The optional arguments "early" or "late" + <div class="note"><h3>Ordering</h3><p>The optional arguments "early" or "late" control when this script runs relative to other modules.</p></div> </div> @@ -1374,7 +1374,7 @@ function authcheck_hook(r) return apache2.OK end</pre> - <div class="note"><h3>Ordering</h3><p>The optional arguments "early" or "late" + <div class="note"><h3>Ordering</h3><p>The optional arguments "early" or "late" control when this script runs relative to other modules.</p></div> </div> @@ -1428,11 +1428,11 @@ processing</td></tr> <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr> </table> <p> - This simple logging hook allows you to run a function when httpd enters the - logging phase of a request. With it, you can append data to your own logs, - manipulate data before the regular log is written, or prevent a log entry + This simple logging hook allows you to run a function when httpd enters the + logging phase of a request. With it, you can append data to your own logs, + manipulate data before the regular log is written, or prevent a log entry from being created. To prevent the usual logging from happening, simply return - <code>apache2.DONE</code> in your logging handler, otherwise return + <code>apache2.DONE</code> in your logging handler, otherwise return <code>apache2.OK</code> to tell httpd to log as normal. </p> <p>Example:</p> @@ -1443,7 +1443,7 @@ function logger(r) -- flip a coin: -- If 1, then we write to our own Lua log and tell httpd not to log -- in the main log. - -- If 2, then we just sanitize the output a bit and tell httpd to + -- If 2, then we just sanitize the output a bit and tell httpd to -- log the sanitized bits. if math.random(1,2) == 1 then @@ -1472,7 +1472,7 @@ end</pre> <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_lua</td></tr> </table> - <p>Like <code class="directive">LuaHookTranslateName</code> but executed at the + <p>Like <code class="directive">LuaHookTranslateName</code> but executed at the map-to-storage phase of a request. Modules like mod_cache run at this phase, which makes for an interesting example on what to do here:</p> <pre class="prettyprint lang-config">LuaHookMapToStorage /path/to/lua/script.lua check_cache</pre> @@ -1480,7 +1480,7 @@ end</pre> <pre class="prettyprint lang-lua">require"apache2" cached_files = {} -function read_file(filename) +function read_file(filename) local input = io.open(filename, "r") if input then local data = input:read("*a") @@ -1555,7 +1555,7 @@ end</pre> <div class="note"><h3>Context</h3><p>This directive is not valid in <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code>, <code class="directive"><a href="../mod/core.html#files"><Files></a></code>, or htaccess context.</p></div> - <div class="note"><h3>Ordering</h3><p>The optional arguments "early" or "late" + <div class="note"><h3>Ordering</h3><p>The optional arguments "early" or "late" control when this script runs relative to other modules.</p></div> @@ -1570,8 +1570,8 @@ end</pre> <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_lua</td></tr> </table><p> - This directive provides a hook for the type_checker phase of the request processing. - This phase is where requests are assigned a content type and a handler, and thus can + This directive provides a hook for the type_checker phase of the request processing. + This phase is where requests are assigned a content type and a handler, and thus can be used to modify the type and handler based on input: </p> <pre class="prettyprint lang-config">LuaHookTypeChecker /path/to/lua/script.lua type_checker</pre> @@ -1605,7 +1605,7 @@ end</pre> more specific section are run <em>after</em> those defined in the more generic section (LuaInherit parent-first). You can reverse this order, or make the parent context not apply at all.</p> - + <p> In previous 2.3.x releases, the default was effectively to ignore LuaHook* directives from parent configuration sections.</p> </div> @@ -1619,12 +1619,12 @@ end</pre> <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr> <tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>2.4.5 and later</td></tr> </table> -<p>Provides a means of adding a Lua function as an input filter. -As with output filters, input filters work as coroutines, -first yielding before buffers are sent, then yielding whenever -a bucket needs to be passed down the chain, and finally (optionally) -yielding anything that needs to be appended to the input data. The -global variable <code>bucket</code> holds the buckets as they are passed +<p>Provides a means of adding a Lua function as an input filter. +As with output filters, input filters work as coroutines, +first yielding before buffers are sent, then yielding whenever +a bucket needs to be passed down the chain, and finally (optionally) +yielding anything that needs to be appended to the input data. The +global variable <code>bucket</code> holds the buckets as they are passed onto the Lua script: </p> @@ -1659,7 +1659,7 @@ The input filter supports denying/skipping a filter if it is deemed unwanted: end</pre> <p> -See "<a href="#modifying_buckets">Modifying contents with Lua +See "<a href="#modifying_buckets">Modifying contents with Lua filters</a>" for more information. </p> @@ -1677,7 +1677,7 @@ filters</a>" for more information. <p>This directive matches a uri pattern to invoke a specific handler function in a specific file. It uses PCRE regular expressions to match the uri, and supports interpolating - match groups into both the file path and the function name. + match groups into both the file path and the function name. Be careful writing your regular expressions to avoid security issues.</p> <div class="example"><h3>Examples:</h3><pre class="prettyprint lang-config">LuaMapHandler /(\w+)/(\w+) /scripts/$1.lua handle_$2</pre> @@ -1704,12 +1704,12 @@ filters</a>" for more information. <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr> <tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>2.4.5 and later</td></tr> </table> -<p>Provides a means of adding a Lua function as an output filter. -As with input filters, output filters work as coroutines, -first yielding before buffers are sent, then yielding whenever -a bucket needs to be passed down the chain, and finally (optionally) -yielding anything that needs to be appended to the input data. The -global variable <code>bucket</code> holds the buckets as they are passed +<p>Provides a means of adding a Lua function as an output filter. +As with input filters, output filters work as coroutines, +first yielding before buffers are sent, then yielding whenever +a bucket needs to be passed down the chain, and finally (optionally) +yielding anything that needs to be appended to the input data. The +global variable <code>bucket</code> holds the buckets as they are passed onto the Lua script: </p> @@ -1732,7 +1732,7 @@ function output_filter(r) end</pre> <p> -As with the input filter, the output filter supports denying/skipping a filter +As with the input filter, the output filter supports denying/skipping a filter if it is deemed unwanted: </p> <pre class="prettyprint lang-lua">function output_filter(r) @@ -1744,13 +1744,13 @@ if it is deemed unwanted: end</pre> <div class="note"><h3>Lua filters with <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code></h3> -<p> When a Lua filter is used as the underlying provider via the -<code class="directive"><a href="../mod/mod_filter.html#filterprovider">FilterProvider</a></code> directive, filtering +<p> When a Lua filter is used as the underlying provider via the +<code class="directive"><a href="../mod/mod_filter.html#filterprovider">FilterProvider</a></code> directive, filtering will only work when the <var>filter-name</var> is identical to the <var>provider-name</var>. </p> </div> <p> -See "<a href="#modifying_buckets">Modifying contents with Lua filters</a>" for more +See "<a href="#modifying_buckets">Modifying contents with Lua filters</a>" for more information. </p> @@ -1801,10 +1801,10 @@ LuaPackagePath /scripts/lib/?/init.lua</pre> <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_lua</td></tr> </table> <p> - This phase is run immediately after the request has been mapped to a virtal host, - and can be used to either do some request processing before the other phases kick - in, or to serve a request without the need to translate, map to storage et cetera. - As this phase is run before anything else, directives such as <code class="directive"><a href="../mod/core.html#location"><Location></a></code> or <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> are void in this phase, just as + This phase is run immediately after the request has been mapped to a virtal host, + and can be used to either do some request processing before the other phases kick + in, or to serve a request without the need to translate, map to storage et cetera. + As this phase is run before anything else, directives such as <code class="directive"><a href="../mod/core.html#location"><Location></a></code> or <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code> are void in this phase, just as URIs have not been properly parsed yet. </p> <div class="note"><h3>Context</h3><p>This directive is not valid in <code class="directive"><a href="../mod/core.html#directory"><Directory></a></code>, <code class="directive"><a href="../mod/core.html#files"><Files></a></code>, or htaccess @@ -1850,27 +1850,27 @@ LuaPackagePath /scripts/lib/?/init.lua</pre> <dt>conn:</dt> <dd>Same as request but attached to the connection_rec</dd> - <dt>thread:</dt> <dd>Use the interpreter for the lifetime of the thread + <dt>thread:</dt> <dd>Use the interpreter for the lifetime of the thread handling the request (only available with threaded MPMs).</dd> <dt>server:</dt> <dd>This one is different than others because the server scope is quite long lived, and multiple threads will have the same server_rec. To accommodate this, server scoped Lua states are stored in an apr - resource list. The <code>min</code> and <code>max</code> arguments - specify the minimum and maximum number of Lua states to keep in the + resource list. The <code>min</code> and <code>max</code> arguments + specify the minimum and maximum number of Lua states to keep in the pool.</dd> </dl> <p> - Generally speaking, the <code>thread</code> and <code>server</code> scopes - execute roughly 2-3 times faster than the rest, because they don't have to - spawn new Lua states on every request (especially with the event MPM, as - even keepalive requests will use a new thread for each request). If you are - satisfied that your scripts will not have problems reusing a state, then - the <code>thread</code> or <code>server</code> scopes should be used for - maximum performance. While the <code>thread</code> scope will provide the - fastest responses, the <code>server</code> scope will use less memory, as - states are pooled, allowing f.x. 1000 threads to share only 100 Lua states, + Generally speaking, the <code>thread</code> and <code>server</code> scopes + execute roughly 2-3 times faster than the rest, because they don't have to + spawn new Lua states on every request (especially with the event MPM, as + even keepalive requests will use a new thread for each request). If you are + satisfied that your scripts will not have problems reusing a state, then + the <code>thread</code> or <code>server</code> scopes should be used for + maximum performance. While the <code>thread</code> scope will provide the + fastest responses, the <code>server</code> scope will use less memory, as + states are pooled, allowing f.x. 1000 threads to share only 100 Lua states, thus using only 10% of the memory required by the <code>thread</code> scope. </p> diff --git a/docs/manual/mod/mod_lua.xml b/docs/manual/mod/mod_lua.xml index 56d4460590..05e50cb197 100644 --- a/docs/manual/mod/mod_lua.xml +++ b/docs/manual/mod/mod_lua.xml @@ -48,9 +48,9 @@ at any time, even between stable releases of the 2.4.x series. Be sure to check the CHANGES file before upgrading.</note> <note type="warning"><title>Warning</title> -<p>This module holds a great deal of power over httpd, which is both a -strength and a potential security risk. It is <strong>not</strong> recommended -that you use this module on a server that is shared with users you do not +<p>This module holds a great deal of power over httpd, which is both a +strength and a potential security risk. It is <strong>not</strong> recommended +that you use this module on a server that is shared with users you do not trust, as it can be abused to change the internal workings of httpd.</p> </note> @@ -217,26 +217,26 @@ performing access control, or setting mime types:</p> <tr> <td>Quick handler</td> <td><directive module="mod_lua">LuaQuickHandler</directive></td> - <td>This is the first hook that will be called after a request has + <td>This is the first hook that will be called after a request has been mapped to a host or virtual host</td> </tr> <tr> <td>Translate name</td> <td><directive module="mod_lua">LuaHookTranslateName</directive></td> - <td>This phase translates the requested URI into a filename on the + <td>This phase translates the requested URI into a filename on the system. Modules such as <module>mod_alias</module> and <module>mod_rewrite</module> operate in this phase.</td> </tr> <tr> <td>Map to storage</td> <td><directive module="mod_lua">LuaHookMapToStorage</directive></td> - <td>This phase maps files to their physical, cached or external/proxied storage. + <td>This phase maps files to their physical, cached or external/proxied storage. It can be used by proxy or caching modules</td> </tr> <tr> <td>Check Access</td> <td><directive module="mod_lua">LuaHookAccessChecker</directive></td> - <td>This phase checks whether a client has access to a resource. This + <td>This phase checks whether a client has access to a resource. This phase is run before the user is authenticated, so beware. </td> </tr> @@ -247,42 +247,42 @@ performing access control, or setting mime types:</p> </tr> <tr> <td>Check Authorization</td> - <td><directive module="mod_lua">LuaHookAuthChecker</directive> or + <td><directive module="mod_lua">LuaHookAuthChecker</directive> or <directive module="mod_lua">LuaAuthzProvider</directive></td> - <td>This phase authorizes a user based on the negotiated credentials, such as + <td>This phase authorizes a user based on the negotiated credentials, such as user ID, client certificate etc. </td> </tr> <tr> <td>Check Type</td> <td><directive module="mod_lua">LuaHookTypeChecker</directive></td> - <td>This phase checks the requested file and assigns a content type and + <td>This phase checks the requested file and assigns a content type and a handler to it</td> </tr> <tr> <td>Fixups</td> <td><directive module="mod_lua">LuaHookFixups</directive></td> - <td>This is the final "fix anything" phase before the content handlers + <td>This is the final "fix anything" phase before the content handlers are run. Any last-minute changes to the request should be made here.</td> </tr> <tr> <td>Content handler</td> <td>fx. <code>.lua</code> files or through <directive module="mod_lua">LuaMapHandler</directive></td> - <td>This is where the content is handled. Files are read, parsed, some are run, + <td>This is where the content is handled. Files are read, parsed, some are run, and the result is sent to the client</td> </tr> <tr> <td>Logging</td> <td><directive module="mod_lua">LuaHookLog</directive></td> - <td>Once a request has been handled, it enters several logging phases, + <td>Once a request has been handled, it enters several logging phases, which logs the request in either the error or access log. Mod_lua is able to hook into the start of this and control logging output.</td> </tr> </table> -<p>Hook functions are passed the request object as their only argument -(except for LuaAuthzProvider, which also gets passed the arguments from +<p>Hook functions are passed the request object as their only argument +(except for LuaAuthzProvider, which also gets passed the arguments from the Require directive). They can return any value, depending on the hook, but most commonly they'll return OK, DONE, or DECLINED, which you can write in Lua as @@ -359,21 +359,21 @@ end <td><code>ap_auth_type</code></td> <td>string</td> <td>no</td> - <td>If an authentication check was made, this is set to the type + <td>If an authentication check was made, this is set to the type of authentication (f.x. <code>basic</code>)</td> </tr> <tr> <td><code>args</code></td> <td>string</td> <td>yes</td> - <td>The query string arguments extracted from the request + <td>The query string arguments extracted from the request (f.x. <code>foo=bar&name=johnsmith</code>)</td> </tr> <tr> <td><code>assbackwards</code></td> <td>boolean</td> <td>no</td> - <td>Set to true if this is an HTTP/0.9 style request + <td>Set to true if this is an HTTP/0.9 style request (e.g. <code>GET /foo</code> (with no headers) )</td> </tr> <tr> @@ -410,7 +410,7 @@ end <td><code>content_type</code></td> <td>string</td> <td>yes</td> - <td>The content type of the current request, as determined in the + <td>The content type of the current request, as determined in the type_check phase (f.x. <code>image/gif</code> or <code>text/html</code>)</td> </tr> <tr> @@ -443,18 +443,18 @@ end <td><code>filename</code></td> <td>string</td> <td>yes</td> - <td>The file name that the request maps to, f.x. /www/example.com/foo.txt. This can be - changed in the translate-name or map-to-storage phases of a request to allow the + <td>The file name that the request maps to, f.x. /www/example.com/foo.txt. This can be + changed in the translate-name or map-to-storage phases of a request to allow the default handler (or script handlers) to serve a different file than what was requested.</td> </tr> <tr> <td><code>handler</code></td> <td>string</td> <td>yes</td> - <td>The name of the <a href="../handler.html">handler</a> that should serve this request, f.x. - <code>lua-script</code> if it is to be served by mod_lua. This is typically set by the - <directive module="mod_mime">AddHandler</directive> or <directive module="core">SetHandler</directive> - directives, but could also be set via mod_lua to allow another handler to serve up a specific request + <td>The name of the <a href="../handler.html">handler</a> that should serve this request, f.x. + <code>lua-script</code> if it is to be served by mod_lua. This is typically set by the + <directive module="mod_mime">AddHandler</directive> or <directive module="core">SetHandler</directive> + directives, but could also be set via mod_lua to allow another handler to serve up a specific request that would otherwise not be served by it. </td> </tr> @@ -463,7 +463,7 @@ end <td><code>headers_in</code></td> <td>table</td> <td>yes</td> - <td>MIME header environment from the request. This contains headers such as <code>Host, + <td>MIME header environment from the request. This contains headers such as <code>Host, User-Agent, Referer</code> and so on.</td> </tr> <tr> @@ -542,7 +542,7 @@ end <td><code>proxyreq</code></td> <td>string</td> <td>yes</td> - <td>Denotes whether this is a proxy request or not. This value is generally set in + <td>Denotes whether this is a proxy request or not. This value is generally set in the post_read_request/translate_name phase of a request.</td> </tr> <tr> @@ -657,7 +657,7 @@ end </highlight> <highlight language="lua"> -r:parseargs() -- returns two tables; one standard key/value table for regular GET data, +r:parseargs() -- returns two tables; one standard key/value table for regular GET data, -- and one for multi-value data (fx. foo=1&foo=2&foo=3): local GET, GETMULTI = r:parseargs() @@ -667,9 +667,9 @@ r:puts("Your name is: " .. GET['name'] or "Unknown") <highlight language="lua"> r:parsebody([sizeLimit]) -- parse the request body as a POST and return two lua tables, -- just like r:parseargs(). - -- An optional number may be passed to specify the maximum number + -- An optional number may be passed to specify the maximum number -- of bytes to parse. Default is 8192 bytes: - + local POST, POSTMULTI = r:parsebody(1024*1024) r:puts("Your name is: " .. POST['name'] or "Unknown") </highlight> @@ -727,7 +727,7 @@ local unescaped = r:unescape(url) -- returns 'http://foo.bar/1 2 3 & 4 + 5' <highlight language="lua"> r:construct_url(string) -- Constructs an URL from an URI -local url = r:construct_url(r.uri) +local url = r:construct_url(r.uri) </highlight> <highlight language="lua"> @@ -770,7 +770,7 @@ r:clock() -- Returns the current time with microsecond precision r:requestbody(filename) -- Reads and returns the request body of a request. -- If 'filename' is specified, it instead saves the -- contents to that file: - + local input = r:requestbody() r:puts("You sent the following request body to me:\n") r:puts(input) @@ -800,12 +800,12 @@ end </highlight> <highlight language="lua"> -r:runtime_dir_relative(filename) -- Compute the name of a run-time file (e.g., shared memory "file") - -- relative to the appropriate run-time directory. +r:runtime_dir_relative(filename) -- Compute the name of a run-time file (e.g., shared memory "file") + -- relative to the appropriate run-time directory. </highlight> <highlight language="lua"> -r:server_info() -- Returns a table containing server information, such as +r:server_info() -- Returns a table containing server information, such as -- the name of the httpd executable file, mpm used etc. </highlight> @@ -834,9 +834,9 @@ r:escape_logitem(string) -- Escapes a string for logging <highlight language="lua"> r.strcmp_match(string, pattern) -- Checks if 'string' matches 'pattern' using strcmp_match (globs). -- fx. whether 'www.example.com' matches '*.example.com': - + local match = r.strcmp_match("foobar.com", "foo*.com") -if match then +if match then r:puts("foobar.com matches foo*.com") end </highlight> @@ -857,7 +857,7 @@ r:send_interim_response(clear) -- Sends an interim (1xx) response to the client. <highlight language="lua"> r:custom_response(status_code, string) -- Construct and set a custom response for a given status code. -- This works much like the ErrorDocument directive: - + r:custom_response(404, "Baleted!") </highlight> @@ -911,12 +911,12 @@ r:dbacquire(dbType[, dbParams]) -- Acquires a connection to a database and retur r:ivm_set("key", value) -- Set an Inter-VM variable to hold a specific value. -- These values persist even though the VM is gone or not being used, -- and so should only be used if MaxConnectionsPerChild is > 0 - -- Values can be numbers, strings and booleans, and are stored on a + -- Values can be numbers, strings and booleans, and are stored on a -- per process basis (so they won't do much good with a prefork mpm) - + r:ivm_get("key") -- Fetches a variable set by ivm_set. Returns the contents of the variable -- if it exists or nil if no such variable exists. - + -- An example getter/setter that saves a global variable outside the VM: function handle(r) -- First VM to call this will get no value, and will have to create it @@ -1095,10 +1095,10 @@ r:activeconfig() -- Get a walkable tree of the active (virtualhost-specific) htt <section id="modifying_buckets"> <title>Modifying contents with Lua filters</title> <p> - Filter functions implemented via <directive module="mod_lua">LuaInputFilter</directive> - or <directive module="mod_lua">LuaOutputFilter</directive> are designed as - three-stage non-blocking functions using coroutines to suspend and resume a - function as buckets are sent down the filter chain. The core structure of + Filter functions implemented via <directive module="mod_lua">LuaInputFilter</directive> + or <directive module="mod_lua">LuaOutputFilter</directive> are designed as + three-stage non-blocking functions using coroutines to suspend and resume a + function as buckets are sent down the filter chain. The core structure of such a function is: </p> <highlight language="lua"> @@ -1110,11 +1110,11 @@ function filter(r) return -- This would skip this filter. end -- Regardless of whether we have data to prepend, a yield MUST be called here. - -- Note that only output filters can prepend data. Input filters must use the + -- Note that only output filters can prepend data. Input filters must use the -- final stage to append data to the content. coroutine.yield([optional header to be prepended to the content]) - - -- After we have yielded, buckets will be sent to us, one by one, and we can + + -- After we have yielded, buckets will be sent to us, one by one, and we can -- do whatever we want with them and then pass on the result. -- Buckets are stored in the global variable 'bucket', so we create a loop -- that checks if 'bucket' is not nil: @@ -1123,9 +1123,9 @@ function filter(r) coroutine.yield(output) -- Return our new content to the filter chain end - -- Once the buckets are gone, 'bucket' is set to nil, which will exit the + -- Once the buckets are gone, 'bucket' is set to nil, which will exit the -- loop and land us here. Anything extra we want to append to the content - -- can be done by doing a final yield here. Both input and output filters + -- can be done by doing a final yield here. Both input and output filters -- can append data to the content in this phase. coroutine.yield([optional footer to be appended to the content]) end @@ -1208,7 +1208,7 @@ local connected = database:active() </section> <section id="result_sets"> <title>Working with result sets</title> - <p>The result set returned by <code>db:select</code> or by the prepared statement functions + <p>The result set returned by <code>db:select</code> or by the prepared statement functions created through <code>db:prepare</code> can be used to fetch rows synchronously or asynchronously, depending on the row number specified:<br/> <code>result(0)</code> fetches all rows in a synchronous manner, returning a table of rows.<br/> @@ -1224,7 +1224,7 @@ local row = result(-1) -- Fetch the next available row, asynchronously local row = result(1234) -- Fetch row number 1234, asynchronously local row = result(-1, true) -- Fetch the next available row, using row names as key indexes. </highlight> - <p>One can construct a function that returns an iterative function to iterate over all rows + <p>One can construct a function that returns an iterative function to iterate over all rows in a synchronous or asynchronous way, depending on the async argument: </p> <highlight language="lua"> @@ -1266,8 +1266,8 @@ end <title>Closing a database connection</title> <p>Database handles should be closed using <code>database:close()</code> when they are no longer - needed. If you do not close them manually, they will eventually be garbage collected and - closed by mod_lua, but you may end up having too many unused connections to the database + needed. If you do not close them manually, they will eventually be garbage collected and + closed by mod_lua, but you may end up having too many unused connections to the database if you leave the closing up to mod_lua. Essentially, the following two measures are the same: </p> @@ -1284,11 +1284,11 @@ collectgarbage() -- close the handle via GC </section> <section id="database_caveat"> <title>Precautions when working with databases</title> - <p>Although the standard <code>query</code> and <code>run</code> functions are freely - available, it is recommended that you use prepared statements whenever possible, to - both optimize performance (if your db handle lives on for a long time) and to minimize + <p>Although the standard <code>query</code> and <code>run</code> functions are freely + available, it is recommended that you use prepared statements whenever possible, to + both optimize performance (if your db handle lives on for a long time) and to minimize the risk of SQL injection attacks. <code>run</code> and <code>query</code> should only - be used when there are no variables inserted into a statement (a static statement). + be used when there are no variables inserted into a statement (a static statement). When using dynamic statements, use <code>db:prepare</code> or <code>db:prepared</code>. </p> </section> @@ -1335,27 +1335,27 @@ collectgarbage() -- close the handle via GC <dt>conn:</dt> <dd>Same as request but attached to the connection_rec</dd> - <dt>thread:</dt> <dd>Use the interpreter for the lifetime of the thread + <dt>thread:</dt> <dd>Use the interpreter for the lifetime of the thread handling the request (only available with threaded MPMs).</dd> <dt>server:</dt> <dd>This one is different than others because the server scope is quite long lived, and multiple threads will have the same server_rec. To accommodate this, server scoped Lua states are stored in an apr - resource list. The <code>min</code> and <code>max</code> arguments - specify the minimum and maximum number of Lua states to keep in the + resource list. The <code>min</code> and <code>max</code> arguments + specify the minimum and maximum number of Lua states to keep in the pool.</dd> </dl> <p> - Generally speaking, the <code>thread</code> and <code>server</code> scopes - execute roughly 2-3 times faster than the rest, because they don't have to - spawn new Lua states on every request (especially with the event MPM, as - even keepalive requests will use a new thread for each request). If you are - satisfied that your scripts will not have problems reusing a state, then - the <code>thread</code> or <code>server</code> scopes should be used for - maximum performance. While the <code>thread</code> scope will provide the - fastest responses, the <code>server</code> scope will use less memory, as - states are pooled, allowing f.x. 1000 threads to share only 100 Lua states, + Generally speaking, the <code>thread</code> and <code>server</code> scopes + execute roughly 2-3 times faster than the rest, because they don't have to + spawn new Lua states on every request (especially with the event MPM, as + even keepalive requests will use a new thread for each request). If you are + satisfied that your scripts will not have problems reusing a state, then + the <code>thread</code> or <code>server</code> scopes should be used for + maximum performance. While the <code>thread</code> scope will provide the + fastest responses, the <code>server</code> scope will use less memory, as + states are pooled, allowing f.x. 1000 threads to share only 100 Lua states, thus using only 10% of the memory required by the <code>thread</code> scope. </p> </usage> @@ -1373,7 +1373,7 @@ collectgarbage() -- close the handle via GC <p>This directive matches a uri pattern to invoke a specific handler function in a specific file. It uses PCRE regular expressions to match the uri, and supports interpolating - match groups into both the file path and the function name. + match groups into both the file path and the function name. Be careful writing your regular expressions to avoid security issues.</p> <example><title>Examples:</title> @@ -1515,7 +1515,7 @@ end type="section" module="core">Files</directive>, or htaccess context.</p></note> - <note><title>Ordering</title><p>The optional arguments "early" or "late" + <note><title>Ordering</title><p>The optional arguments "early" or "late" control when this script runs relative to other modules.</p></note> </usage> @@ -1548,11 +1548,11 @@ processing</description> <override>All</override> <usage> <p> - This simple logging hook allows you to run a function when httpd enters the - logging phase of a request. With it, you can append data to your own logs, - manipulate data before the regular log is written, or prevent a log entry + This simple logging hook allows you to run a function when httpd enters the + logging phase of a request. With it, you can append data to your own logs, + manipulate data before the regular log is written, or prevent a log entry from being created. To prevent the usual logging from happening, simply return - <code>apache2.DONE</code> in your logging handler, otherwise return + <code>apache2.DONE</code> in your logging handler, otherwise return <code>apache2.OK</code> to tell httpd to log as normal. </p> <p>Example:</p> @@ -1565,7 +1565,7 @@ function logger(r) -- flip a coin: -- If 1, then we write to our own Lua log and tell httpd not to log -- in the main log. - -- If 2, then we just sanitize the output a bit and tell httpd to + -- If 2, then we just sanitize the output a bit and tell httpd to -- log the sanitized bits. if math.random(1,2) == 1 then @@ -1595,7 +1595,7 @@ end </contextlist> <override>All</override> <usage> - <p>Like <directive>LuaHookTranslateName</directive> but executed at the + <p>Like <directive>LuaHookTranslateName</directive> but executed at the map-to-storage phase of a request. Modules like mod_cache run at this phase, which makes for an interesting example on what to do here:</p> <highlight language="config"> @@ -1605,7 +1605,7 @@ end require"apache2" cached_files = {} -function read_file(filename) +function read_file(filename) local input = io.open(filename, "r") if input then local data = input:read("*a") @@ -1647,7 +1647,7 @@ end <!-- Third argument does not work at the moment! <compatibility>The optional third argument is supported in 2.3.15 and later</compatibility> <usage><p>...</p> - <note><title>Ordering</title><p>The optional arguments "early" or "late" + <note><title>Ordering</title><p>The optional arguments "early" or "late" control when this script runs relative to other modules.</p></note> </usage> --> @@ -1662,8 +1662,8 @@ end </contextlist> <override>All</override> <usage><p> - This directive provides a hook for the type_checker phase of the request processing. - This phase is where requests are assigned a content type and a handler, and thus can + This directive provides a hook for the type_checker phase of the request processing. + This phase is where requests are assigned a content type and a handler, and thus can be used to modify the type and handler based on input: </p> <highlight language="config"> @@ -1730,7 +1730,7 @@ function authcheck_hook(r) return apache2.OK end </highlight> - <note><title>Ordering</title><p>The optional arguments "early" or "late" + <note><title>Ordering</title><p>The optional arguments "early" or "late" control when this script runs relative to other modules.</p></note> </usage> </directivesynopsis> @@ -1747,7 +1747,7 @@ end <usage> <p>Add your hook to the access_checker phase. An access checker hook function usually returns OK, DECLINED, or HTTP_FORBIDDEN.</p> - <note><title>Ordering</title><p>The optional arguments "early" or "late" + <note><title>Ordering</title><p>The optional arguments "early" or "late" control when this script runs relative to other modules.</p></note> </usage> </directivesynopsis> @@ -1778,7 +1778,7 @@ hook function usually returns OK, DECLINED, or HTTP_FORBIDDEN.</p> more specific section are run <em>after</em> those defined in the more generic section (LuaInherit parent-first). You can reverse this order, or make the parent context not apply at all.</p> - + <p> In previous 2.3.x releases, the default was effectively to ignore LuaHook* directives from parent configuration sections.</p></usage> </directivesynopsis> @@ -1792,12 +1792,12 @@ hook function usually returns OK, DECLINED, or HTTP_FORBIDDEN.</p> <override>All</override> <usage> <p> - This phase is run immediately after the request has been mapped to a virtal host, - and can be used to either do some request processing before the other phases kick - in, or to serve a request without the need to translate, map to storage et cetera. + This phase is run immediately after the request has been mapped to a virtal host, + and can be used to either do some request processing before the other phases kick + in, or to serve a request without the need to translate, map to storage et cetera. As this phase is run before anything else, directives such as <directive type="section" module="core">Location</directive> or <directive - type="section" module="core">Directory</directive> are void in this phase, just as + type="section" module="core">Directory</directive> are void in this phase, just as URIs have not been properly parsed yet. </p> <note><title>Context</title><p>This directive is not valid in <directive @@ -1847,12 +1847,12 @@ end <compatibility>2.4.5 and later</compatibility> <usage> -<p>Provides a means of adding a Lua function as an input filter. -As with output filters, input filters work as coroutines, -first yielding before buffers are sent, then yielding whenever -a bucket needs to be passed down the chain, and finally (optionally) -yielding anything that needs to be appended to the input data. The -global variable <code>bucket</code> holds the buckets as they are passed +<p>Provides a means of adding a Lua function as an input filter. +As with output filters, input filters work as coroutines, +first yielding before buffers are sent, then yielding whenever +a bucket needs to be passed down the chain, and finally (optionally) +yielding anything that needs to be appended to the input data. The +global variable <code>bucket</code> holds the buckets as they are passed onto the Lua script: </p> @@ -1890,7 +1890,7 @@ function input_filter(r) end </highlight> <p> -See "<a href="#modifying_buckets">Modifying contents with Lua +See "<a href="#modifying_buckets">Modifying contents with Lua filters</a>" for more information. </p> </usage> @@ -1904,12 +1904,12 @@ filters</a>" for more information. <compatibility>2.4.5 and later</compatibility> <usage> -<p>Provides a means of adding a Lua function as an output filter. -As with input filters, output filters work as coroutines, -first yielding before buffers are sent, then yielding whenever -a bucket needs to be passed down the chain, and finally (optionally) -yielding anything that needs to be appended to the input data. The -global variable <code>bucket</code> holds the buckets as they are passed +<p>Provides a means of adding a Lua function as an output filter. +As with input filters, output filters work as coroutines, +first yielding before buffers are sent, then yielding whenever +a bucket needs to be passed down the chain, and finally (optionally) +yielding anything that needs to be appended to the input data. The +global variable <code>bucket</code> holds the buckets as they are passed onto the Lua script: </p> @@ -1934,7 +1934,7 @@ function output_filter(r) end </highlight> <p> -As with the input filter, the output filter supports denying/skipping a filter +As with the input filter, the output filter supports denying/skipping a filter if it is deemed unwanted: </p> <highlight language="lua"> @@ -1947,13 +1947,13 @@ function output_filter(r) end </highlight> <note><title>Lua filters with <module>mod_filter</module></title> -<p> When a Lua filter is used as the underlying provider via the -<directive module="mod_filter">FilterProvider</directive> directive, filtering +<p> When a Lua filter is used as the underlying provider via the +<directive module="mod_filter">FilterProvider</directive> directive, filtering will only work when the <var>filter-name</var> is identical to the <var>provider-name</var>. </p> </note> <p> -See "<a href="#modifying_buckets">Modifying contents with Lua filters</a>" for more +See "<a href="#modifying_buckets">Modifying contents with Lua filters</a>" for more information. </p> diff --git a/docs/manual/mod/mod_macro.html.en b/docs/manual/mod/mod_macro.html.en index 00e2792a8b..e184ba4e87 100644 --- a/docs/manual/mod/mod_macro.html.en +++ b/docs/manual/mod/mod_macro.html.en @@ -107,7 +107,7 @@ Examples section.</p> <p>Parameter names should begin with a sigil such as <code>$</code>, <code>%</code>, or <code>@</code>, so that they are clearly identifiable, and also in order to help deal with interactions with -other directives, such as the core <code class="directive"><a href="../mod/core.html#define">Define</a></code> directive. Failure to do so will +other directives, such as the core <code class="directive"><a href="../mod/core.html#define">Define</a></code> directive. Failure to do so will result in a warning. Nevertheless, you are encouraged to have a good knowledge of your entire server configuration in order to avoid reusing the same variables in different scopes, which can cause confusion.</p> diff --git a/docs/manual/mod/mod_macro.xml b/docs/manual/mod/mod_macro.xml index 00829cd2b7..471b7c1d4f 100644 --- a/docs/manual/mod/mod_macro.xml +++ b/docs/manual/mod/mod_macro.xml @@ -95,7 +95,7 @@ Examples section.</p> <code>%</code>, or <code>@</code>, so that they are clearly identifiable, and also in order to help deal with interactions with other directives, such as the core <directive -module="core">Define</directive> directive. Failure to do so will +module="core">Define</directive> directive. Failure to do so will result in a warning. Nevertheless, you are encouraged to have a good knowledge of your entire server configuration in order to avoid reusing the same variables in different scopes, which can cause confusion.</p> diff --git a/docs/manual/mod/mod_mime.xml.ja b/docs/manual/mod/mod_mime.xml.ja index 19012b840c..97985104e1 100644 --- a/docs/manual/mod/mod_mime.xml.ja +++ b/docs/manual/mod/mod_mime.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: 659902:1673892 (outdated) --> +<!-- English Revision: 659902:1673932 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/mod_policy.html.en b/docs/manual/mod/mod_policy.html.en index b1fe2d4863..19570e38d5 100644 --- a/docs/manual/mod/mod_policy.html.en +++ b/docs/manual/mod/mod_policy.html.en @@ -137,7 +137,7 @@ <dd>Content types that are syntactically invalid or blank can be detected and the request rejected. Types can be restricted to a specific list containing optional wildcards ? and *.</dd> - + <dt><strong><a href="../compliance.html#policylength">POLICY_LENGTH</a> </strong>: Enforce the presence of a Content-Length</dt> <dd>The length of responses can be specified in one of three ways, by @@ -231,31 +231,31 @@ <pre class="prettyprint lang-config"><Location "/"> SetOutputFilter POLICY_TYPE;POLICY_LENGTH;POLICY_KEEPALIVE;POLICY_VARY;POLICY_VALIDATION; \ POLICY_CONDITIONAL;POLICY_NOCACHE;POLICY_MAXAGE;POLICY_VERSION - + # content type must be present and valid, but can be anything PolicyType enforce */* - + # reject if no explicitly declared content length PolicyLength enforce - + # covered by the policy length filter PolicyKeepalive ignore - + # reject if User-Agent appears within Vary headers PolicyVary enforce User-Agent - + # we want to enforce validation PolicyValidation enforce - + # non-functional conditional responses should be rejected PolicyConditional enforce - + # no-cache responses should be rejected PolicyNocache enforce - + # maxage must be at least a day PolicyMaxage enforce 86400 - + # request version can be anything PolicyVersion ignore HTTP/1.1 </Location> diff --git a/docs/manual/mod/mod_policy.xml b/docs/manual/mod/mod_policy.xml index 8da25f5bf8..c29bd3f56e 100644 --- a/docs/manual/mod/mod_policy.xml +++ b/docs/manual/mod/mod_policy.xml @@ -102,7 +102,7 @@ <dd>Content types that are syntactically invalid or blank can be detected and the request rejected. Types can be restricted to a specific list containing optional wildcards ? and *.</dd> - + <dt><strong><a href="../compliance.html#policylength">POLICY_LENGTH</a> </strong>: Enforce the presence of a Content-Length</dt> <dd>The length of responses can be specified in one of three ways, by @@ -197,31 +197,31 @@ <Location "/"> SetOutputFilter POLICY_TYPE;POLICY_LENGTH;POLICY_KEEPALIVE;POLICY_VARY;POLICY_VALIDATION; \ POLICY_CONDITIONAL;POLICY_NOCACHE;POLICY_MAXAGE;POLICY_VERSION - + # content type must be present and valid, but can be anything PolicyType enforce */* - + # reject if no explicitly declared content length PolicyLength enforce - + # covered by the policy length filter PolicyKeepalive ignore - + # reject if User-Agent appears within Vary headers PolicyVary enforce User-Agent - + # we want to enforce validation PolicyValidation enforce - + # non-functional conditional responses should be rejected PolicyConditional enforce - + # no-cache responses should be rejected PolicyNocache enforce - + # maxage must be at least a day PolicyMaxage enforce 86400 - + # request version can be anything PolicyVersion ignore HTTP/1.1 </Location> diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en index 36ee67e136..00442441e4 100644 --- a/docs/manual/mod/mod_proxy.html.en +++ b/docs/manual/mod/mod_proxy.html.en @@ -473,7 +473,7 @@ ProxyPass "/examples" "http://backend.example.com/examples" timeout=10</pre> other request headers.</p> <p>Note: If you need to specify custom request headers to be - added to the forwarded request, use the + added to the forwarded request, use the <code class="directive"><a href="../mod/mod_headers.html#requestheader">RequestHeader</a></code> directive.</p> @@ -726,13 +726,13 @@ NoProxy .example.com 192.168.112.0/21</pre> <div class="note"><h3>Differences from the Location configuration section</h3> - <p>A backend URL matches the configuration section if it begins with the + <p>A backend URL matches the configuration section if it begins with the the <var>wildcard-url</var> string, even if the last path segment in the - directive only matches a prefix of the backend URL. For example, - <Proxy http://example.com/foo> matches all of - http://example.com/foo, http://example.com/foo/bar, and + directive only matches a prefix of the backend URL. For example, + <Proxy http://example.com/foo> matches all of + http://example.com/foo, http://example.com/foo/bar, and http://example.com/foobar. The matching of the final URL differs - from the behavior of the <code class="directive"><a href="../mod/core.html#location"><Location></a></code> section, which for purposes of this note + from the behavior of the <code class="directive"><a href="../mod/core.html#location"><Location></a></code> section, which for purposes of this note treats the final path component as if it ended in a slash.</p> <p>For more control over the matching, see <code class="directive"><ProxyMatch></code>.</p> </div> @@ -998,7 +998,7 @@ through</td></tr> a local virtual path; <var>url</var> is a partial URL for the remote server and cannot include a query string.</p> - <div class="note"><strong>Note: </strong>This directive cannot be used within a + <div class="note"><strong>Note: </strong>This directive cannot be used within a <code><Directory></code> context.</div> <div class="warning">The <code class="directive"><a href="#proxyrequests">ProxyRequests</a></code> directive should @@ -1335,7 +1335,7 @@ ProxyPass "/mirror/foo" "http://backend.example.com"</pre> <tr><td>stickysessionsep</td> <td>"."</td> <td>Sets the separation symbol in the session cookie. Some backend application servers - do not use the '.' as the symbol. For example the Oracle Weblogic server uses + do not use the '.' as the symbol. For example the Oracle Weblogic server uses '!'. The correct symbol can be set using this option. The setting of 'Off' signifies that no symbol is used. </td></tr> @@ -1529,9 +1529,9 @@ ProxyPassReverse "/mirror/foo/" "https://backend.example.com/"</pre> matches, the server will substitute any parenthesized matches into the given string and use it as a new <var>url</var>.</p> - <div class="note"><strong>Note: </strong>This directive cannot be used within a + <div class="note"><strong>Note: </strong>This directive cannot be used within a <code><Directory></code> context.</div> - + <p>Suppose the local server has address <code>http://example.com/</code>; then</p> @@ -1687,7 +1687,7 @@ reverse proxy. This directive rewrites the <code>path</code> string in <var>internal-path</var>, the cookie path will be replaced with <var>public-path</var>. </p><p> -In the example given with +In the example given with <code class="directive"><a href="#proxypassreverse">ProxyPassReverse</a></code>, the directive: </p> <pre class="prettyprint lang-config">ProxyPassReverseCookiePath "/" "/mirror/foo/"</pre> diff --git a/docs/manual/mod/mod_proxy.xml.fr b/docs/manual/mod/mod_proxy.xml.fr index 57f26c0979..88ce6baa00 100644 --- a/docs/manual/mod/mod_proxy.xml.fr +++ b/docs/manual/mod/mod_proxy.xml.fr @@ -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: 1659902:1673892 (outdated) --> +<!-- English Revision: 1659902:1673932 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja index 40705d38a5..8b3b28594f 100644 --- a/docs/manual/mod/mod_proxy.xml.ja +++ b/docs/manual/mod/mod_proxy.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: 344971:1673892 (outdated) --> +<!-- English Revision: 344971:1673932 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/mod_proxy_ajp.html.en b/docs/manual/mod/mod_proxy_ajp.html.en index e07d3685e2..604a39aa9c 100644 --- a/docs/manual/mod/mod_proxy_ajp.html.en +++ b/docs/manual/mod/mod_proxy_ajp.html.en @@ -89,7 +89,7 @@ ProxyPass "/app" "balancer://cluster/app"</pre> header given to the proxy, and the application server can be expected to generate self-referential headers relative to this host, so no rewriting is necessary.</p> - + <p>The main exception is when the URL path on the proxy differs from that on the backend. In this case, a redirect header can be rewritten relative to the diff --git a/docs/manual/mod/mod_proxy_ajp.xml b/docs/manual/mod/mod_proxy_ajp.xml index fad37d8e40..d3fe239f75 100644 --- a/docs/manual/mod/mod_proxy_ajp.xml +++ b/docs/manual/mod/mod_proxy_ajp.xml @@ -79,7 +79,7 @@ ProxyPass "/app" "balancer://cluster/app" header given to the proxy, and the application server can be expected to generate self-referential headers relative to this host, so no rewriting is necessary.</p> - + <p>The main exception is when the URL path on the proxy differs from that on the backend. In this case, a redirect header can be rewritten relative to the diff --git a/docs/manual/mod/mod_proxy_ajp.xml.ja b/docs/manual/mod/mod_proxy_ajp.xml.ja index 47ded6b6a5..78ff290740 100644 --- a/docs/manual/mod/mod_proxy_ajp.xml.ja +++ b/docs/manual/mod/mod_proxy_ajp.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: 669473:1649001 (outdated) --> +<!-- English Revision: 669473:1673930 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/mod_proxy_balancer.xml.ja b/docs/manual/mod/mod_proxy_balancer.xml.ja index 2c54e13dec..33cd9490af 100644 --- a/docs/manual/mod/mod_proxy_balancer.xml.ja +++ b/docs/manual/mod/mod_proxy_balancer.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: 395228:1673892 (outdated) --> +<!-- English Revision: 395228:1673930 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/mod_proxy_fcgi.html.en b/docs/manual/mod/mod_proxy_fcgi.html.en index 53a1334168..9ac46b98f2 100644 --- a/docs/manual/mod/mod_proxy_fcgi.html.en +++ b/docs/manual/mod/mod_proxy_fcgi.html.en @@ -87,8 +87,8 @@ <div class="example"><h3>Single application instance, connection reuse</h3><pre class="prettyprint lang-config">ProxyPass "/myapp/" "fcgi://localhost:4000/" enablereuse=on</pre> </div> - <p> The following example passes the request URI as a filesystem - path for the PHP-FPM daemon to run. The request URL is implicitly added + <p> The following example passes the request URI as a filesystem + path for the PHP-FPM daemon to run. The request URL is implicitly added to the 2nd parameter. The hostname and port following fcgi:// are where PHP-FPM is listening. Connection pooling is enabled.</p> <div class="example"><h3>PHP-FPM</h3><pre class="prettyprint lang-config">ProxyPassMatch "^/myapp/.*\.php(/.*)?$" "fcgi://localhost:9000/var/www/" enablereuse=on</pre> @@ -121,9 +121,9 @@ specified FastCGI server using reverse proxy. This feature is available in Apache HTTP Server 2.4.10 and later. For performance reasons, you will want to define a <a href="mod_proxy.html#workers">worker</a> - representing the same fcgi:// backend. The benefit of this form is that it - allows the normal mapping of URI to filename to occur in the server, and the - local filesystem result is passed to the backend. When FastCGI is + representing the same fcgi:// backend. The benefit of this form is that it + allows the normal mapping of URI to filename to occur in the server, and the + local filesystem result is passed to the backend. When FastCGI is configured this way, the server can calculate the most accurate PATH_INFO. </p> @@ -132,7 +132,7 @@ SetHandler "proxy:unix:/path/to/app.sock|fcgi://localhost/" </FilesMatch> # Define a matching worker. - # The part that is matched to the SetHandler is the part that + # The part that is matched to the SetHandler is the part that # follows the pipe. If you need to distinguish, "localhost; can # be anything unique. <Proxy fcgi://localhost/ enablereuse=on max=10> @@ -166,19 +166,19 @@ is chosen: <dl> <dt>first-dot</dt> - <dd>PATH_INFO is split from the slash following the + <dd>PATH_INFO is split from the slash following the <em>first</em> "." in the URL.</dd> <dt>last-dot</dt> - <dd>PATH_INFO is split from the slash following the + <dd>PATH_INFO is split from the slash following the <em>last</em> "." in the URL.</dd> - <dt>full</dt> - <dd>PATH_INFO is calculated by an attempt to map the URL to the + <dt>full</dt> + <dd>PATH_INFO is calculated by an attempt to map the URL to the local filesystem.</dd> <dt>unescape</dt> - <dd>PATH_INFO is the path component of the URL, unescaped / + <dd>PATH_INFO is the path component of the URL, unescaped / decoded.</dd> <dt>any other value</dt> - <dd>PATH_INFO is the same as the path component of the URL. + <dd>PATH_INFO is the same as the path component of the URL. Originally, this was the only proxy-fcgi-pathinfo option.</dd> </dl> </dd> diff --git a/docs/manual/mod/mod_proxy_fcgi.xml b/docs/manual/mod/mod_proxy_fcgi.xml index da0c155d73..d1a975397f 100644 --- a/docs/manual/mod/mod_proxy_fcgi.xml +++ b/docs/manual/mod/mod_proxy_fcgi.xml @@ -82,8 +82,8 @@ </highlight> </example> - <p> The following example passes the request URI as a filesystem - path for the PHP-FPM daemon to run. The request URL is implicitly added + <p> The following example passes the request URI as a filesystem + path for the PHP-FPM daemon to run. The request URL is implicitly added to the 2nd parameter. The hostname and port following fcgi:// are where PHP-FPM is listening. Connection pooling is enabled.</p> <example><title>PHP-FPM</title> @@ -99,7 +99,7 @@ <example><title>PHP-FPM with UDS</title> <highlight language="config"> # UDS does not currently support connection reuse - ProxyPassMatch "^/(.*\.php(/.*)?)$" "unix:/var/run/php5-fpm.sock|fcgi://localhost/var/www/" + ProxyPassMatch "^/(.*\.php(/.*)?)$" "unix:/var/run/php5-fpm.sock|fcgi://localhost/var/www/" </highlight> </example> @@ -125,9 +125,9 @@ ProxyPass "/myapp/" "balancer://myappcluster/" specified FastCGI server using reverse proxy. This feature is available in Apache HTTP Server 2.4.10 and later. For performance reasons, you will want to define a <a href="mod_proxy.html#workers">worker</a> - representing the same fcgi:// backend. The benefit of this form is that it - allows the normal mapping of URI to filename to occur in the server, and the - local filesystem result is passed to the backend. When FastCGI is + representing the same fcgi:// backend. The benefit of this form is that it + allows the normal mapping of URI to filename to occur in the server, and the + local filesystem result is passed to the backend. When FastCGI is configured this way, the server can calculate the most accurate PATH_INFO. </p> @@ -138,7 +138,7 @@ ProxyPass "/myapp/" "balancer://myappcluster/" SetHandler "proxy:unix:/path/to/app.sock|fcgi://localhost/" </FilesMatch> # Define a matching worker. - # The part that is matched to the SetHandler is the part that + # The part that is matched to the SetHandler is the part that # follows the pipe. If you need to distinguish, "localhost; can # be anything unique. <Proxy fcgi://localhost/ enablereuse=on max=10> @@ -175,19 +175,19 @@ ProxyPass "/myapp/" "balancer://myappcluster/" is chosen: <dl> <dt>first-dot</dt> - <dd>PATH_INFO is split from the slash following the + <dd>PATH_INFO is split from the slash following the <em>first</em> "." in the URL.</dd> <dt>last-dot</dt> - <dd>PATH_INFO is split from the slash following the + <dd>PATH_INFO is split from the slash following the <em>last</em> "." in the URL.</dd> - <dt>full</dt> - <dd>PATH_INFO is calculated by an attempt to map the URL to the + <dt>full</dt> + <dd>PATH_INFO is calculated by an attempt to map the URL to the local filesystem.</dd> <dt>unescape</dt> - <dd>PATH_INFO is the path component of the URL, unescaped / + <dd>PATH_INFO is the path component of the URL, unescaped / decoded.</dd> <dt>any other value</dt> - <dd>PATH_INFO is the same as the path component of the URL. + <dd>PATH_INFO is the same as the path component of the URL. Originally, this was the only proxy-fcgi-pathinfo option.</dd> </dl> </dd> diff --git a/docs/manual/mod/mod_proxy_html.html.en b/docs/manual/mod/mod_proxy_html.html.en index ec67a3fdaa..42529f3492 100644 --- a/docs/manual/mod/mod_proxy_html.html.en +++ b/docs/manual/mod/mod_proxy_html.html.en @@ -240,7 +240,7 @@ for earlier 2.x versions</td></tr> </ul> <p>Take care when using these. The fixes will correct certain authoring mistakes, but risk also erroneously fixing links that were correct to start with. -Only use them if you know you have a broken backend server.</p> +Only use them if you know you have a broken backend server.</p> </div> <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> diff --git a/docs/manual/mod/mod_proxy_html.xml b/docs/manual/mod/mod_proxy_html.xml index b752a1796e..784fd5ffef 100644 --- a/docs/manual/mod/mod_proxy_html.xml +++ b/docs/manual/mod/mod_proxy_html.xml @@ -277,7 +277,7 @@ for earlier 2.x versions</compatibility> </ul> <p>Take care when using these. The fixes will correct certain authoring mistakes, but risk also erroneously fixing links that were correct to start with. -Only use them if you know you have a broken backend server.</p> +Only use them if you know you have a broken backend server.</p> </usage> </directivesynopsis> @@ -421,4 +421,3 @@ will generate output using the same encoding as the input.</p> </modulesynopsis> - diff --git a/docs/manual/mod/mod_proxy_scgi.html.en b/docs/manual/mod/mod_proxy_scgi.html.en index 5a10499183..0de453c7da 100644 --- a/docs/manual/mod/mod_proxy_scgi.html.en +++ b/docs/manual/mod/mod_proxy_scgi.html.en @@ -164,7 +164,7 @@ header</td></tr> <div class="example"><h3>Example</h3><pre class="prettyprint lang-config"># Use the default header (X-Sendfile) ProxySCGISendfile On - + # Use a different header ProxySCGISendfile X-Send-Static</pre> </div> diff --git a/docs/manual/mod/mod_proxy_scgi.xml b/docs/manual/mod/mod_proxy_scgi.xml index c7155b28af..2e641dab74 100644 --- a/docs/manual/mod/mod_proxy_scgi.xml +++ b/docs/manual/mod/mod_proxy_scgi.xml @@ -132,7 +132,7 @@ header</description> <highlight language="config"> # Use the default header (X-Sendfile) ProxySCGISendfile On - + # Use a different header ProxySCGISendfile X-Send-Static </highlight> diff --git a/docs/manual/mod/mod_proxy_wstunnel.html.en b/docs/manual/mod/mod_proxy_wstunnel.html.en index e2eb4d197d..466684f558 100644 --- a/docs/manual/mod/mod_proxy_wstunnel.html.en +++ b/docs/manual/mod/mod_proxy_wstunnel.html.en @@ -68,10 +68,10 @@ ProxyPass "/wss2/" "wss://echo.websocket.org/"</pre> <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr> <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy_wstunnel</td></tr> </table> - <p>This directive instructs the server to try to create an asynchronous tunnel. - If the current MPM does not support the necessary features, a synchronous + <p>This directive instructs the server to try to create an asynchronous tunnel. + If the current MPM does not support the necessary features, a synchronous tunnel is used.</p> - <div class="note"><h3>Note</h3><p>Async support is experimental and subject + <div class="note"><h3>Note</h3><p>Async support is experimental and subject to change.</p></div> </div> @@ -85,10 +85,10 @@ ProxyPass "/wss2/" "wss://echo.websocket.org/"</pre> <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr> <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy_wstunnel</td></tr> </table> - <p>If <code class="directive">ProxyWebsocketAsync</code> is enabled, this directive + <p>If <code class="directive">ProxyWebsocketAsync</code> is enabled, this directive controls how long the server synchronously waits for more data.</p> - <div class="note"><h3>Note</h3><p>Async support is experimental and subject + <div class="note"><h3>Note</h3><p>Async support is experimental and subject to change. </p></div> @@ -103,7 +103,7 @@ ProxyPass "/wss2/" "wss://echo.websocket.org/"</pre> <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr> <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy_wstunnel</td></tr> </table> - <p>This directive imposes a maximum amount of time for the tunnel to be + <p>This directive imposes a maximum amount of time for the tunnel to be left open while idle.</p> </div> diff --git a/docs/manual/mod/mod_proxy_wstunnel.xml b/docs/manual/mod/mod_proxy_wstunnel.xml index c23b4f411b..f5dc0ec10b 100644 --- a/docs/manual/mod/mod_proxy_wstunnel.xml +++ b/docs/manual/mod/mod_proxy_wstunnel.xml @@ -62,10 +62,10 @@ ProxyPass "/wss2/" "wss://echo.websocket.org/" </contextlist> <usage> - <p>This directive instructs the server to try to create an asynchronous tunnel. - If the current MPM does not support the necessary features, a synchronous + <p>This directive instructs the server to try to create an asynchronous tunnel. + If the current MPM does not support the necessary features, a synchronous tunnel is used.</p> - <note><title>Note</title><p>Async support is experimental and subject + <note><title>Note</title><p>Async support is experimental and subject to change.</p></note> </usage> </directivesynopsis> @@ -80,7 +80,7 @@ ProxyPass "/wss2/" "wss://echo.websocket.org/" </contextlist> <usage> - <p>This directive imposes a maximum amount of time for the tunnel to be + <p>This directive imposes a maximum amount of time for the tunnel to be left open while idle.</p> </usage> </directivesynopsis> @@ -95,10 +95,10 @@ ProxyPass "/wss2/" "wss://echo.websocket.org/" </contextlist> <usage> - <p>If <directive>ProxyWebsocketAsync</directive> is enabled, this directive + <p>If <directive>ProxyWebsocketAsync</directive> is enabled, this directive controls how long the server synchronously waits for more data.</p> - <note><title>Note</title><p>Async support is experimental and subject + <note><title>Note</title><p>Async support is experimental and subject to change. </p></note> </usage> diff --git a/docs/manual/mod/mod_ratelimit.html.en b/docs/manual/mod/mod_ratelimit.html.en index caaf853cd8..68d396f9d2 100644 --- a/docs/manual/mod/mod_ratelimit.html.en +++ b/docs/manual/mod/mod_ratelimit.html.en @@ -39,7 +39,7 @@ variable <code>rate-limit</code>.</p> <div class="example"><h3>Example Configuration</h3><pre class="prettyprint lang-config"><Location "/downloads"> SetOutputFilter RATE_LIMIT - SetEnv rate-limit 400 + SetEnv rate-limit 400 </Location></pre> </div> diff --git a/docs/manual/mod/mod_ratelimit.xml b/docs/manual/mod/mod_ratelimit.xml index 5cac06cbf8..affb2daf26 100644 --- a/docs/manual/mod/mod_ratelimit.xml +++ b/docs/manual/mod/mod_ratelimit.xml @@ -41,7 +41,7 @@ variable <code>rate-limit</code>.</p> <highlight language="config"> <Location "/downloads"> SetOutputFilter RATE_LIMIT - SetEnv rate-limit 400 + SetEnv rate-limit 400 </Location> </highlight> </example> @@ -49,4 +49,3 @@ variable <code>rate-limit</code>.</p> </summary> </modulesynopsis> - diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en index ef26e12bcd..c6a4df74cb 100644 --- a/docs/manual/mod/mod_rewrite.html.en +++ b/docs/manual/mod/mod_rewrite.html.en @@ -115,38 +115,38 @@ URLs on the fly</td></tr> <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_rewrite</td></tr> </table> <p>The <code class="directive">RewriteBase</code> directive specifies the - URL prefix to be used for per-directory (htaccess) + URL prefix to be used for per-directory (htaccess) <code class="directive">RewriteRule</code> directives that substitute a relative path.</p> <p> This directive is <em>required</em> when you use a relative path in a substitution in per-directory (htaccess) context unless either of the following conditions are true:</p> <ul> - <li> The original request, and the substitution, are underneath the + <li> The original request, and the substitution, are underneath the <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> - (as opposed to reachable by other means, such as + (as opposed to reachable by other means, such as <code class="directive"><a href="../mod/mod_alias.html#alias">Alias</a></code>).</li> <li> The <em>filesystem</em> path to the directory containing the - <code class="directive">RewriteRule</code>, suffixed by the relative - substitution is also valid as a URL path on the server + <code class="directive">RewriteRule</code>, suffixed by the relative + substitution is also valid as a URL path on the server (this is rare).</li> - <li> In Apache HTTP Server 2.4.11 and later, this directive may be - omitted when the request is mapped via + <li> In Apache HTTP Server 2.4.11 and later, this directive may be + omitted when the request is mapped via <code class="directive"><a href="../mod/mod_alias.html#alias">Alias</a></code> or <code class="module"><a href="../mod/mod_userdir.html">mod_userdir</a></code>.</li> </ul> <p> In the example below, <code class="directive">RewriteBase</code> is necessary to avoid rewriting to http://example.com/opt/myapp-1.2.3/welcome.html - since the resource was not relative to the document root. This + since the resource was not relative to the document root. This misconfiguration would normally cause the server to look for an "opt" directory under the document root.</p> <pre class="prettyprint lang-config">DocumentRoot "/var/www/example.com" AliasMatch "^/myapp" "/opt/myapp-1.2.3" <Directory "/opt/myapp-1.2.3"> RewriteEngine On - RewriteBase /myapp/ - RewriteRule ^index\.html$ welcome.html + RewriteBase "/myapp/" + RewriteRule "^index\.html$" "welcome.html" </Directory></pre> @@ -343,9 +343,9 @@ AliasMatch "^/myapp" "/opt/myapp-1.2.3" been determined by the server at the time <code>REQUEST_FILENAME</code> is referenced. Otherwise, such as when used in virtual host context, the same - value as <code>REQUEST_URI</code>. Depending on the value of + value as <code>REQUEST_URI</code>. Depending on the value of <code class="directive"><a href="../mod/core.html#acceptpathinfo">AcceptPathInfo</a></code>, the - server may have only used some leading components of the + server may have only used some leading components of the <code>REQUEST_URI</code> to map the request to a file. </dd> @@ -439,7 +439,7 @@ AliasMatch "^/myapp" "/opt/myapp-1.2.3" so that certain conditions might not be evaluated at all.</p></li> <li> - <a id="LA-U" name="LA-U"><code>%{LA-U:variable}</code></a> + <a id="LA-U" name="LA-U"><code>%{LA-U:variable}</code></a> can be used for look-aheads which perform an internal (URL-based) sub-request to determine the final value of <em>variable</em>. This can be used to access @@ -622,8 +622,8 @@ AliasMatch "^/myapp" "/opt/myapp-1.2.3" it can impact your server's performance!</p> <p> This flag <em>only</em> returns information about things like access control, authentication, and authorization. This flag - <em>does not</em> return information about the status code the - configured handler (static file, CGI, proxy, etc.) would have + <em>does not</em> return information about the status code the + configured handler (static file, CGI, proxy, etc.) would have returned.</p> </li> <li>'<strong>-x</strong>' (has e<strong>x</strong>ecutable @@ -648,8 +648,8 @@ AliasMatch "^/myapp" "/opt/myapp-1.2.3" to block unwanted hotlinking. </p> - <pre class="prettyprint lang-config"> RewriteCond expr "! %{HTTP_REFERER} -strmatch '*://%{HTTP_HOST}/*'"<br /> - RewriteRule ^/images - [F]</pre> + <pre class="prettyprint lang-config">RewriteCond expr "! %{HTTP_REFERER} -strmatch '*://%{HTTP_HOST}/*'"<br /> +RewriteRule "^/images" "-" [F]</pre> </li> @@ -676,9 +676,9 @@ AliasMatch "^/myapp" "/opt/myapp-1.2.3" Use this to combine rule conditions with a local OR instead of the implicit AND. Typical example: -<pre class="prettyprint lang-config">RewriteCond %{REMOTE_HOST} ^host1 [OR] -RewriteCond %{REMOTE_HOST} ^host2 [OR] -RewriteCond %{REMOTE_HOST} ^host3 +<pre class="prettyprint lang-config">RewriteCond "%{REMOTE_HOST}" "^host1" [OR] +RewriteCond "%{REMOTE_HOST}" "^host2" [OR] +RewriteCond "%{REMOTE_HOST}" "^host3" RewriteRule ...some special stuff for any of these hosts...</pre> @@ -705,10 +705,10 @@ RewriteRule ...some special stuff for any of these hosts...</pre> ``<code>User-Agent:</code>'' header of the request, you can use the following: </p> -<pre class="prettyprint lang-config">RewriteCond %{HTTP_USER_AGENT} (iPhone|Blackberry|Android) -RewriteRule ^/$ /homepage.mobile.html [L] +<pre class="prettyprint lang-config">RewriteCond "%{HTTP_USER_AGENT}" "(iPhone|Blackberry|Android)" +RewriteRule "^/$" "/homepage.mobile.html" [L] -RewriteRule ^/$ /homepage.std.html [L]</pre> +RewriteRule "^/$" "/homepage.std.html" [L]</pre> <p>Explanation: If you use a browser which identifies itself @@ -793,13 +793,13 @@ RewriteRule ^/$ /homepage.std.html [L]</pre> <p>For example, you might define a <code class="directive">RewriteMap</code> as:</p> - <pre class="prettyprint lang-config">RewriteMap examplemap txt:/path/to/file/map.txt</pre> + <pre class="prettyprint lang-config">RewriteMap examplemap "txt:/path/to/file/map.txt"</pre> <p>You would then be able to use this map in a <code class="directive">RewriteRule</code> as follows:</p> - <pre class="prettyprint lang-config">RewriteRule ^/ex/(.*) ${examplemap:$1}</pre> + <pre class="prettyprint lang-config">RewriteRule "^/ex/(.*)" "${examplemap:$1}"</pre> <p>The meaning of the <em>MapTypeOptions</em> argument depends on @@ -926,7 +926,7 @@ RewriteRule ^/$ /homepage.std.html [L]</pre> 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 @@ -953,7 +953,7 @@ RewriteRule ^/$ /homepage.std.html [L]</pre> Available in Apache HTTP Server 2.4.3 and later.</p> <div class="warning"> - <h3>Security Warning</h3> + <h3>Security Warning</h3> <p>Enabling this option will make the server vulnerable to security issues if used with rewrite rules which are not @@ -980,8 +980,8 @@ RewriteRule ^/$ /homepage.std.html [L]</pre> <p>When a relative substitution is made in directory (htaccess) context and <code class="directive"><a href="#rewritebase">RewriteBase</a></code> has not been set, this module uses some - extended URL and filesystem context information to change the - relative substitution back into a URL. Modules such as + extended URL and filesystem context information to change the + relative substitution back into a URL. Modules such as <code class="module"><a href="../mod/mod_userdir.html">mod_userdir</a></code> and <code class="module"><a href="../mod/mod_alias.html">mod_alias</a></code> supply this extended context info. </p> </dd> @@ -1100,7 +1100,7 @@ cannot use <code>$N</code> in the substitution string! <dd>Designates the location on the file-system of the resource to be delivered to the client. Substitutions are only - treated as a file-system path when the rule is configured in + treated as a file-system path when the rule is configured in server (virtualhost) context and the first component of the path in the substitution exists in the file-system</dd> @@ -1114,7 +1114,7 @@ cannot use <code>$N</code> in the substitution string! you specify a <em>Substitution</em> string of <code>/www/file.html</code>, then this will be treated as a URL-path <em>unless</em> a directory named <code>www</code> - exists at the root or your file-system (or, in the case of + exists at the root or your file-system (or, in the case of using rewrites in a <code>.htaccess</code> file, relative to your document root), in which case it will be treated as a file-system path. If you wish other @@ -1201,12 +1201,12 @@ cannot use <code>$N</code> in the substitution string! </tr> <tr> <td>B</td> - <td>Escape non-alphanumeric characters in backreferences <em>before</em> + <td>Escape non-alphanumeric characters in backreferences <em>before</em> applying the transformation. <em><a href="../rewrite/flags.html#flag_b">details ...</a></em></td> </tr> <tr class="odd"> <td>backrefnoplus|BNP</td> - <td>If backreferences are being escaped, spaces should be escaped to + <td>If backreferences are being escaped, spaces should be escaped to %20 instead of +. Useful when the backreference will be used in the path component rather than the query string.<em><a href="../rewrite/flags.html#flag_bnp">details ...</a></em></td> </tr> @@ -1298,7 +1298,7 @@ cannot use <code>$N</code> in the substitution string! </tr> <tr class="odd"> <td>qsappend|QSA</td> - <td>Appends any query string from the original request URL to + <td>Appends any query string from the original request URL to any query string created in the rewrite target.<em><a href="../rewrite/flags.html#flag_qsa">details ...</a></em></td> </tr> <tr> @@ -1403,7 +1403,7 @@ directive.</p> <p><strong>Inside per-directory configuration for <code>/somepath</code><br /> (<code>/physical/path/to/somepath/.htaccess</code>, with - <code>RewriteBase /somepath</code>)<br /> + <code>RewriteBase "/somepath"</code>)<br /> for request ``<code>GET /somepath/localpath/pathinfo</code>'':</strong><br /> </p> diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml index deac92d367..a10acce596 100644 --- a/docs/manual/mod/mod_rewrite.xml +++ b/docs/manual/mod/mod_rewrite.xml @@ -206,7 +206,7 @@ URLs on the fly</description> directory on disk but lack a trailing slash, in the expectation that the <module>mod_dir</module> module will issue the client with a redirect to the canonical URL with a trailing slash.</p> - + <p>When the <directive module="mod_dir">DirectorySlash</directive> 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 @@ -236,7 +236,7 @@ URLs on the fly</description> Available in Apache HTTP Server 2.4.3 and later.</p> <note type="warning"> - <title>Security Warning</title> + <title>Security Warning</title> <p>Enabling this option will make the server vulnerable to security issues if used with rewrite rules which are not @@ -265,8 +265,8 @@ URLs on the fly</description> <p>When a relative substitution is made in directory (htaccess) context and <directive module="mod_rewrite" >RewriteBase</directive> has not been set, this module uses some - extended URL and filesystem context information to change the - relative substitution back into a URL. Modules such as + extended URL and filesystem context information to change the + relative substitution back into a URL. Modules such as <module>mod_userdir</module> and <module>mod_alias</module> supply this extended context info. </p> </dd> @@ -318,14 +318,14 @@ URLs on the fly</description> <directive>RewriteMap</directive> as:</p> <highlight language="config"> - RewriteMap examplemap txt:/path/to/file/map.txt +RewriteMap examplemap "txt:/path/to/file/map.txt" </highlight> <p>You would then be able to use this map in a <directive>RewriteRule</directive> as follows:</p> <highlight language="config"> - RewriteRule ^/ex/(.*) ${examplemap:$1} +RewriteRule "^/ex/(.*)" "${examplemap:$1}" </highlight> <p>The meaning of the <em>MapTypeOptions</em> argument depends on @@ -382,30 +382,30 @@ URLs on the fly</description> <usage> <p>The <directive>RewriteBase</directive> directive specifies the - URL prefix to be used for per-directory (htaccess) + URL prefix to be used for per-directory (htaccess) <directive>RewriteRule</directive> directives that substitute a relative path.</p> <p> This directive is <em>required</em> when you use a relative path in a substitution in per-directory (htaccess) context unless either of the following conditions are true:</p> <ul> - <li> The original request, and the substitution, are underneath the + <li> The original request, and the substitution, are underneath the <directive module="core">DocumentRoot</directive> - (as opposed to reachable by other means, such as + (as opposed to reachable by other means, such as <directive module="mod_alias">Alias</directive>).</li> <li> The <em>filesystem</em> path to the directory containing the - <directive>RewriteRule</directive>, suffixed by the relative - substitution is also valid as a URL path on the server + <directive>RewriteRule</directive>, suffixed by the relative + substitution is also valid as a URL path on the server (this is rare).</li> - <li> In Apache HTTP Server 2.4.11 and later, this directive may be - omitted when the request is mapped via + <li> In Apache HTTP Server 2.4.11 and later, this directive may be + omitted when the request is mapped via <directive module="mod_alias">Alias</directive> or <module>mod_userdir</module>.</li> </ul> <p> In the example below, <directive>RewriteBase</directive> is necessary to avoid rewriting to http://example.com/opt/myapp-1.2.3/welcome.html - since the resource was not relative to the document root. This + since the resource was not relative to the document root. This misconfiguration would normally cause the server to look for an "opt" directory under the document root.</p> <highlight language="config"> @@ -413,8 +413,8 @@ DocumentRoot "/var/www/example.com" AliasMatch "^/myapp" "/opt/myapp-1.2.3" <Directory "/opt/myapp-1.2.3"> RewriteEngine On - RewriteBase /myapp/ - RewriteRule ^index\.html$ welcome.html + RewriteBase "/myapp/" + RewriteRule "^index\.html$" "welcome.html" </Directory> </highlight> @@ -615,9 +615,9 @@ AliasMatch "^/myapp" "/opt/myapp-1.2.3" been determined by the server at the time <code>REQUEST_FILENAME</code> is referenced. Otherwise, such as when used in virtual host context, the same - value as <code>REQUEST_URI</code>. Depending on the value of + value as <code>REQUEST_URI</code>. Depending on the value of <directive module="core">AcceptPathInfo</directive>, the - server may have only used some leading components of the + server may have only used some leading components of the <code>REQUEST_URI</code> to map the request to a file. </dd> @@ -711,7 +711,7 @@ AliasMatch "^/myapp" "/opt/myapp-1.2.3" so that certain conditions might not be evaluated at all.</p></li> <li> - <a id="LA-U" name="LA-U"><code>%{LA-U:variable}</code></a> + <a id="LA-U" name="LA-U"><code>%{LA-U:variable}</code></a> can be used for look-aheads which perform an internal (URL-based) sub-request to determine the final value of <em>variable</em>. This can be used to access @@ -894,8 +894,8 @@ AliasMatch "^/myapp" "/opt/myapp-1.2.3" it can impact your server's performance!</p> <p> This flag <em>only</em> returns information about things like access control, authentication, and authorization. This flag - <em>does not</em> return information about the status code the - configured handler (static file, CGI, proxy, etc.) would have + <em>does not</em> return information about the status code the + configured handler (static file, CGI, proxy, etc.) would have returned.</p> </li> <li>'<strong>-x</strong>' (has e<strong>x</strong>ecutable @@ -921,8 +921,8 @@ AliasMatch "^/myapp" "/opt/myapp-1.2.3" </p> <highlight language="config"> - RewriteCond expr "! %{HTTP_REFERER} -strmatch '*://%{HTTP_HOST}/*'"<br /> - RewriteRule ^/images - [F] +RewriteCond expr "! %{HTTP_REFERER} -strmatch '*://%{HTTP_HOST}/*'"<br /> +RewriteRule "^/images" "-" [F] </highlight> </li> @@ -950,9 +950,9 @@ AliasMatch "^/myapp" "/opt/myapp-1.2.3" instead of the implicit AND. Typical example: <highlight language="config"> -RewriteCond %{REMOTE_HOST} ^host1 [OR] -RewriteCond %{REMOTE_HOST} ^host2 [OR] -RewriteCond %{REMOTE_HOST} ^host3 +RewriteCond "%{REMOTE_HOST}" "^host1" [OR] +RewriteCond "%{REMOTE_HOST}" "^host2" [OR] +RewriteCond "%{REMOTE_HOST}" "^host3" RewriteRule ...some special stuff for any of these hosts... </highlight> @@ -980,10 +980,10 @@ RewriteRule ...some special stuff for any of these hosts... use the following: </p> <highlight language="config"> -RewriteCond %{HTTP_USER_AGENT} (iPhone|Blackberry|Android) -RewriteRule ^/$ /homepage.mobile.html [L] +RewriteCond "%{HTTP_USER_AGENT}" "(iPhone|Blackberry|Android)" +RewriteRule "^/$" "/homepage.mobile.html" [L] -RewriteRule ^/$ /homepage.std.html [L] +RewriteRule "^/$" "/homepage.std.html" [L] </highlight> <p>Explanation: If you use a browser which identifies itself @@ -1110,7 +1110,7 @@ cannot use <code>$N</code> in the substitution string! <dd>Designates the location on the file-system of the resource to be delivered to the client. Substitutions are only - treated as a file-system path when the rule is configured in + treated as a file-system path when the rule is configured in server (virtualhost) context and the first component of the path in the substitution exists in the file-system</dd> @@ -1125,7 +1125,7 @@ cannot use <code>$N</code> in the substitution string! you specify a <em>Substitution</em> string of <code>/www/file.html</code>, then this will be treated as a URL-path <em>unless</em> a directory named <code>www</code> - exists at the root or your file-system (or, in the case of + exists at the root or your file-system (or, in the case of using rewrites in a <code>.htaccess</code> file, relative to your document root), in which case it will be treated as a file-system path. If you wish other @@ -1217,13 +1217,13 @@ cannot use <code>$N</code> in the substitution string! </tr> <tr> <td>B</td> - <td>Escape non-alphanumeric characters in backreferences <em>before</em> + <td>Escape non-alphanumeric characters in backreferences <em>before</em> applying the transformation. <em><a href="../rewrite/flags.html#flag_b">details ...</a></em></td> </tr> <tr> <td>backrefnoplus|BNP</td> - <td>If backreferences are being escaped, spaces should be escaped to + <td>If backreferences are being escaped, spaces should be escaped to %20 instead of +. Useful when the backreference will be used in the path component rather than the query string.<em><a href="../rewrite/flags.html#flag_bnp">details ...</a></em></td> @@ -1324,7 +1324,7 @@ cannot use <code>$N</code> in the substitution string! </tr> <tr> <td>qsappend|QSA</td> - <td>Appends any query string from the original request URL to + <td>Appends any query string from the original request URL to any query string created in the rewrite target.<em><a href="../rewrite/flags.html#flag_qsa">details ...</a></em></td> </tr> @@ -1446,7 +1446,7 @@ directive.</p> <p><strong>Inside per-directory configuration for <code>/somepath</code><br /> (<code>/physical/path/to/somepath/.htaccess</code>, with - <code>RewriteBase /somepath</code>)<br /> + <code>RewriteBase "/somepath"</code>)<br /> for request ``<code>GET /somepath/localpath/pathinfo</code>'':</strong><br /> </p> diff --git a/docs/manual/mod/mod_so.html.en b/docs/manual/mod/mod_so.html.en index 8622bb2543..15eda7bc07 100644 --- a/docs/manual/mod/mod_so.html.en +++ b/docs/manual/mod/mod_so.html.en @@ -159,7 +159,7 @@ Windows</td></tr></table> <p>For example:</p> - <pre class="prettyprint lang-config">LoadFile libexec/libxmlparse.so</pre> + <pre class="prettyprint lang-config">LoadFile "libexec/libxmlparse.so"</pre> @@ -181,7 +181,7 @@ of active modules</td></tr> <code>module</code> in the file, and is listed as the <a href="module-dict.html#ModuleIdentifier">Module Identifier</a> in the module documentation. Example:</p> - <pre class="prettyprint lang-config">LoadModule status_module modules/mod_status.so</pre> + <pre class="prettyprint lang-config">LoadModule status_module "modules/mod_status.so"</pre> <p>loads the named module from the modules subdirectory of the diff --git a/docs/manual/mod/mod_so.html.fr b/docs/manual/mod/mod_so.html.fr index 09da66a788..1fd8ed5b3d 100644 --- a/docs/manual/mod/mod_so.html.fr +++ b/docs/manual/mod/mod_so.html.fr @@ -30,6 +30,8 @@ <a href="../ko/mod/mod_so.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> | <a href="../tr/mod/mod_so.html" hreflang="tr" rel="alternate" title="Trke"> tr </a></p> </div> +<div class="outofdate">Cette traduction peut tre prime. Vrifiez la version + anglaise pour les changements rcents.</div> <table class="module"><tr><th><a href="module-dict.html#Description">Description:</a></th><td>Chargement de modules ou de code excutable au cours du dmarrage ou du redmarrage du serveur</td></tr> <tr><th><a href="module-dict.html#Status">Statut:</a></th><td>Extension</td></tr> diff --git a/docs/manual/mod/mod_so.html.ja.utf8 b/docs/manual/mod/mod_so.html.ja.utf8 index 55d2ecd129..75594fdf00 100644 --- a/docs/manual/mod/mod_so.html.ja.utf8 +++ b/docs/manual/mod/mod_so.html.ja.utf8 @@ -30,6 +30,10 @@ <a href="../ko/mod/mod_so.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> | <a href="../tr/mod/mod_so.html" hreflang="tr" rel="alternate" title="Türkçe"> tr </a></p> </div> +<div class="outofdate">この日本語訳はすでに古くなっている + 可能性があります。 + 最近更新された内容を見るには英語版をご覧下さい。 + </div> <table class="module"><tr><th><a href="module-dict.html#Description">説明:</a></th><td>起動時や再起動時に実行コードとモジュールをサーバにロードする </td></tr> <tr><th><a href="module-dict.html#Status">ステータス:</a></th><td>Extension</td></tr> diff --git a/docs/manual/mod/mod_so.xml.fr b/docs/manual/mod/mod_so.xml.fr index 96bcf8af8b..34453b2c78 100644 --- a/docs/manual/mod/mod_so.xml.fr +++ b/docs/manual/mod/mod_so.xml.fr @@ -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 : 1433861 --> +<!-- English Revision: 1433861:1673932 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/mod/mod_so.xml.ja b/docs/manual/mod/mod_so.xml.ja index a06dc643da..a2a7b2ce27 100644 --- a/docs/manual/mod/mod_so.xml.ja +++ b/docs/manual/mod/mod_so.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: 1433861 --> +<!-- English Revision: 1433861:1673932 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/mod_so.xml.ko b/docs/manual/mod/mod_so.xml.ko index 0d7c87c367..91f3eb5e94 100644 --- a/docs/manual/mod/mod_so.xml.ko +++ b/docs/manual/mod/mod_so.xml.ko @@ -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: 420990:1433861 (outdated) --> +<!-- English Revision: 420990:1673932 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/mod_so.xml.meta b/docs/manual/mod/mod_so.xml.meta index 180ea77cd8..f316185f2f 100644 --- a/docs/manual/mod/mod_so.xml.meta +++ b/docs/manual/mod/mod_so.xml.meta @@ -8,8 +8,8 @@ <variants> <variant>en</variant> - <variant>fr</variant> - <variant>ja</variant> + <variant outdated="yes">fr</variant> + <variant outdated="yes">ja</variant> <variant outdated="yes">ko</variant> <variant outdated="yes">tr</variant> </variants> diff --git a/docs/manual/mod/mod_so.xml.tr b/docs/manual/mod/mod_so.xml.tr index 5e63c02eeb..0dd13b1f3d 100644 --- a/docs/manual/mod/mod_so.xml.tr +++ b/docs/manual/mod/mod_so.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: 1174747:1433861 (outdated) --> +<!-- English Revision: 1174747:1673932 (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_ssl.html.en b/docs/manual/mod/mod_ssl.html.en index 3e95a0cd98..7c2e8bd8ce 100644 --- a/docs/manual/mod/mod_ssl.html.en +++ b/docs/manual/mod/mod_ssl.html.en @@ -1963,9 +1963,9 @@ function ::= funcname "<strong>(</strong>" funcargs "<strong>)</strong>"</pre> the <a href="../expr.html#functions">ap_expr documentation</a>.</p> <p>The <em>expression</em> is parsed into an internal machine -representation when the configuration is loaded, and then evaluated -during request processing. In .htaccess context, the <em>expression</em> is -both parsed and executed each time the .htaccess file is encountered during +representation when the configuration is loaded, and then evaluated +during request processing. In .htaccess context, the <em>expression</em> is +both parsed and executed each time the .htaccess file is encountered during request processing.</p> <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">SSLRequire ( %{SSL_CIPHER} !~ m/^(EXP|NULL)-/ \ diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml index 75f386b297..1ebf1cbad6 100644 --- a/docs/manual/mod/mod_ssl.xml +++ b/docs/manual/mod/mod_ssl.xml @@ -1524,9 +1524,9 @@ href="#envvars">Environment Variables</a> can be used. For the <a href="../expr.html#functions">ap_expr documentation</a>.</p> <p>The <em>expression</em> is parsed into an internal machine -representation when the configuration is loaded, and then evaluated -during request processing. In .htaccess context, the <em>expression</em> is -both parsed and executed each time the .htaccess file is encountered during +representation when the configuration is loaded, and then evaluated +during request processing. In .htaccess context, the <em>expression</em> is +both parsed and executed each time the .htaccess file is encountered during request processing.</p> <example><title>Example</title> diff --git a/docs/manual/mod/mod_status.xml b/docs/manual/mod/mod_status.xml index fad50d078c..3098c9f74d 100644 --- a/docs/manual/mod/mod_status.xml +++ b/docs/manual/mod/mod_status.xml @@ -153,4 +153,3 @@ performance</description> </section> </modulesynopsis> - diff --git a/docs/manual/mod/mod_substitute.html.en b/docs/manual/mod/mod_substitute.html.en index 385e0f09f3..a5b097fc67 100644 --- a/docs/manual/mod/mod_substitute.html.en +++ b/docs/manual/mod/mod_substitute.html.en @@ -98,7 +98,7 @@ when regular expressions are used, as illustrated in the following example: </p> <div class="example"><h3>Example of using backreferences and captures</h3><pre class="prettyprint lang-config"><Location "/"> AddOutputFilterByType SUBSTITUTE text/html - # "foo=k,bar=k" -> "foo/bar=k" + # "foo=k,bar=k" -> "foo/bar=k" Substitute "s|foo=(\w+),bar=\1|foo/bar=$1" </Location></pre> </div> diff --git a/docs/manual/mod/mod_substitute.xml b/docs/manual/mod/mod_substitute.xml index 534dd62ba1..6b7082fe00 100644 --- a/docs/manual/mod/mod_substitute.xml +++ b/docs/manual/mod/mod_substitute.xml @@ -96,7 +96,7 @@ <highlight language="config"> <Location "/"> AddOutputFilterByType SUBSTITUTE text/html - # "foo=k,bar=k" -> "foo/bar=k" + # "foo=k,bar=k" -> "foo/bar=k" Substitute "s|foo=(\w+),bar=\1|foo/bar=$1" </Location> </highlight> diff --git a/docs/manual/mod/mod_syslog.html.en b/docs/manual/mod/mod_syslog.html.en index a10d5796b1..01fce92f74 100644 --- a/docs/manual/mod/mod_syslog.html.en +++ b/docs/manual/mod/mod_syslog.html.en @@ -56,7 +56,7 @@ syslog(1). The facility is effectively global, and if it is changed in individual virtual hosts, the final facility specified affects the entire server.</p> - + <pre class="prettyprint lang-config">ErrorLog syslog:user</pre> diff --git a/docs/manual/mod/mod_syslog.xml b/docs/manual/mod/mod_syslog.xml index 183889d4ff..3725fd9689 100644 --- a/docs/manual/mod/mod_syslog.xml +++ b/docs/manual/mod/mod_syslog.xml @@ -45,7 +45,7 @@ syslog(1). The facility is effectively global, and if it is changed in individual virtual hosts, the final facility specified affects the entire server.</p> - + <highlight language="config"> ErrorLog syslog:user </highlight> diff --git a/docs/manual/mod/mod_vhost_alias.html.en b/docs/manual/mod/mod_vhost_alias.html.en index 3d88bbf10c..f034d37c19 100644 --- a/docs/manual/mod/mod_vhost_alias.html.en +++ b/docs/manual/mod/mod_vhost_alias.html.en @@ -183,15 +183,15 @@ VirtualDocumentRoot "/usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2"</pre> <p>The example request would come from <code>/usr/local/apache/vhosts/example.com/d/o/m/ain/directory/file.html</code>.</p> -<p> A very common request by users is the ability to point multiple domains to multiple -document roots without having to worry about the length or number of parts of the +<p> A very common request by users is the ability to point multiple domains to multiple +document roots without having to worry about the length or number of parts of the hostname being requested. If the requested hostname is <code>sub.www.domain.example.com</code> instead of simply <code>www.domain.example.com</code>, then using %3+ will result in the document root being <code>/usr/local/apache/vhosts/domain.example.com/...</code> instead of the -intended <code>example.com</code> directory. In such cases, it can be beneficial to use -the combination <code>%-2.0.%-1.0</code>, which will always yield the domain name and the -tld, for example <code>example.com</code> regardless of the number of subdomains appended -to the hostname. As such, one can make a configuration that will direct all first, second +intended <code>example.com</code> directory. In such cases, it can be beneficial to use +the combination <code>%-2.0.%-1.0</code>, which will always yield the domain name and the +tld, for example <code>example.com</code> regardless of the number of subdomains appended +to the hostname. As such, one can make a configuration that will direct all first, second or third level subdomains to the same directory: </p> <pre class="prettyprint lang-config">VirtualDocumentRoot "/usr/local/apache/vhosts/%-2.0.%-1.0"</pre> @@ -258,10 +258,10 @@ for a given virtual host</td></tr> cannot be used in the same context as <code class="directive"><a href="#virtualdocumentrootip">VirtualDocumentRootIP</a></code>.</p> <div class="warning"><h3>Note</h3> -<code class="directive">VirtualDocumentRoot</code> will override any <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> directives you may have put in the same -context or child contexts. Putting a <code class="directive">VirtualDocumentRoot</code> -in the global server scope will effectively override <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> directives in any virtual hosts defined later -on, unless you set <code class="directive">VirtualDocumentRoot</code> to <code>None</code> +<code class="directive">VirtualDocumentRoot</code> will override any <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> directives you may have put in the same +context or child contexts. Putting a <code class="directive">VirtualDocumentRoot</code> +in the global server scope will effectively override <code class="directive"><a href="../mod/core.html#documentroot">DocumentRoot</a></code> directives in any virtual hosts defined later +on, unless you set <code class="directive">VirtualDocumentRoot</code> to <code>None</code> in each virtual host. </div> diff --git a/docs/manual/mod/mod_vhost_alias.xml b/docs/manual/mod/mod_vhost_alias.xml index c70950b53f..73992ba4fc 100644 --- a/docs/manual/mod/mod_vhost_alias.xml +++ b/docs/manual/mod/mod_vhost_alias.xml @@ -171,15 +171,15 @@ VirtualDocumentRoot "/usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2.4+" <p>The example request would come from <code>/usr/local/apache/vhosts/example.com/d/o/m/ain/directory/file.html</code>.</p> -<p> A very common request by users is the ability to point multiple domains to multiple -document roots without having to worry about the length or number of parts of the +<p> A very common request by users is the ability to point multiple domains to multiple +document roots without having to worry about the length or number of parts of the hostname being requested. If the requested hostname is <code>sub.www.domain.example.com</code> instead of simply <code>www.domain.example.com</code>, then using %3+ will result in the document root being <code>/usr/local/apache/vhosts/domain.example.com/...</code> instead of the -intended <code>example.com</code> directory. In such cases, it can be beneficial to use -the combination <code>%-2.0.%-1.0</code>, which will always yield the domain name and the -tld, for example <code>example.com</code> regardless of the number of subdomains appended -to the hostname. As such, one can make a configuration that will direct all first, second +intended <code>example.com</code> directory. In such cases, it can be beneficial to use +the combination <code>%-2.0.%-1.0</code>, which will always yield the domain name and the +tld, for example <code>example.com</code> regardless of the number of subdomains appended +to the hostname. As such, one can make a configuration that will direct all first, second or third level subdomains to the same directory: </p> <highlight language="config"> @@ -254,11 +254,11 @@ for a given virtual host</description> <note type="warning"><title>Note</title> <directive>VirtualDocumentRoot</directive> will override any <directive -module="core">DocumentRoot</directive> directives you may have put in the same -context or child contexts. Putting a <directive>VirtualDocumentRoot</directive> -in the global server scope will effectively override <directive -module="core">DocumentRoot</directive> directives in any virtual hosts defined later -on, unless you set <directive>VirtualDocumentRoot</directive> to <code>None</code> +module="core">DocumentRoot</directive> directives you may have put in the same +context or child contexts. Putting a <directive>VirtualDocumentRoot</directive> +in the global server scope will effectively override <directive +module="core">DocumentRoot</directive> directives in any virtual hosts defined later +on, unless you set <directive>VirtualDocumentRoot</directive> to <code>None</code> in each virtual host. </note> @@ -334,4 +334,3 @@ a given virtual host</description> </directivesynopsis> </modulesynopsis> - diff --git a/docs/manual/mod/mod_xml2enc.xml b/docs/manual/mod/mod_xml2enc.xml index 75804c5896..859ff0dc86 100644 --- a/docs/manual/mod/mod_xml2enc.xml +++ b/docs/manual/mod/mod_xml2enc.xml @@ -172,4 +172,3 @@ xml2EncDefault iso-8859-1 </directivesynopsis> </modulesynopsis> - diff --git a/docs/manual/mod/quickreference.html.de b/docs/manual/mod/quickreference.html.de index 99c8f8ad71..5b3d583b99 100644 --- a/docs/manual/mod/quickreference.html.de +++ b/docs/manual/mod/quickreference.html.de @@ -407,7 +407,7 @@ nicht auf andere Weise ermitteln kann.</td></tr> <tr class="odd"><td><a href="mod_deflate.html#deflatecompressionlevel">DeflateCompressionLevel <var>value</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">How much compression do we apply to the output</td></tr> <tr><td><a href="mod_deflate.html#deflatefilternote">DeflateFilterNote [<var>type</var>] <var>notename</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Places the compression ratio in a note for logging</td></tr> <tr class="odd"><td><a href="mod_deflate.html#deflateinflatelimitrequestbody">DeflateInflateLimitRequestBody<var>value</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum size of inflated request bodies</td></tr> -<tr><td><a href="mod_deflate.html#deflateinflateratioburst">DeflateInflateRatioBurst <var>value</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of times the inflation ratio for request bodies +<tr><td><a href="mod_deflate.html#deflateinflateratioburst">DeflateInflateRatioBurst <var>value</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of times the inflation ratio for request bodies can be crossed</td></tr> <tr class="odd"><td><a href="mod_deflate.html#deflateinflateratiolimit">DeflateInflateRatioLimit <var>value</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum inflation ratio for request bodies</td></tr> <tr><td><a href="mod_deflate.html#deflatememlevel">DeflateMemLevel <var>value</var></a></td><td> 9 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">How much memory should be used by zlib for compression</td></tr> diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en index 8c09709026..28491010bf 100644 --- a/docs/manual/mod/quickreference.html.en +++ b/docs/manual/mod/quickreference.html.en @@ -406,7 +406,7 @@ which no other media type configuration could be found. <tr class="odd"><td><a href="mod_deflate.html#deflatecompressionlevel">DeflateCompressionLevel <var>value</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">How much compression do we apply to the output</td></tr> <tr><td><a href="mod_deflate.html#deflatefilternote">DeflateFilterNote [<var>type</var>] <var>notename</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Places the compression ratio in a note for logging</td></tr> <tr class="odd"><td><a href="mod_deflate.html#deflateinflatelimitrequestbody">DeflateInflateLimitRequestBody<var>value</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum size of inflated request bodies</td></tr> -<tr><td><a href="mod_deflate.html#deflateinflateratioburst">DeflateInflateRatioBurst <var>value</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of times the inflation ratio for request bodies +<tr><td><a href="mod_deflate.html#deflateinflateratioburst">DeflateInflateRatioBurst <var>value</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of times the inflation ratio for request bodies can be crossed</td></tr> <tr class="odd"><td><a href="mod_deflate.html#deflateinflateratiolimit">DeflateInflateRatioLimit <var>value</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum inflation ratio for request bodies</td></tr> <tr><td><a href="mod_deflate.html#deflatememlevel">DeflateMemLevel <var>value</var></a></td><td> 9 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">How much memory should be used by zlib for compression</td></tr> diff --git a/docs/manual/mod/quickreference.html.es b/docs/manual/mod/quickreference.html.es index 5ea41eebb8..f120be79d7 100644 --- a/docs/manual/mod/quickreference.html.es +++ b/docs/manual/mod/quickreference.html.es @@ -413,7 +413,7 @@ which no other media type configuration could be found. <tr class="odd"><td><a href="mod_deflate.html#deflatecompressionlevel">DeflateCompressionLevel <var>value</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">How much compression do we apply to the output</td></tr> <tr><td><a href="mod_deflate.html#deflatefilternote">DeflateFilterNote [<var>type</var>] <var>notename</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Places the compression ratio in a note for logging</td></tr> <tr class="odd"><td><a href="mod_deflate.html#deflateinflatelimitrequestbody">DeflateInflateLimitRequestBody<var>value</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum size of inflated request bodies</td></tr> -<tr><td><a href="mod_deflate.html#deflateinflateratioburst">DeflateInflateRatioBurst <var>value</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of times the inflation ratio for request bodies +<tr><td><a href="mod_deflate.html#deflateinflateratioburst">DeflateInflateRatioBurst <var>value</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of times the inflation ratio for request bodies can be crossed</td></tr> <tr class="odd"><td><a href="mod_deflate.html#deflateinflateratiolimit">DeflateInflateRatioLimit <var>value</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum inflation ratio for request bodies</td></tr> <tr><td><a href="mod_deflate.html#deflatememlevel">DeflateMemLevel <var>value</var></a></td><td> 9 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">How much memory should be used by zlib for compression</td></tr> diff --git a/docs/manual/mod/quickreference.html.ja.utf8 b/docs/manual/mod/quickreference.html.ja.utf8 index 0e9ea07a02..57037e0f10 100644 --- a/docs/manual/mod/quickreference.html.ja.utf8 +++ b/docs/manual/mod/quickreference.html.ja.utf8 @@ -387,7 +387,7 @@ ServerHello</td></tr> <tr class="odd"><td><a href="mod_deflate.html#deflatecompressionlevel">DeflateCompressionLevel <var>value</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">出力に対して行なう圧縮の程度</td></tr> <tr><td><a href="mod_deflate.html#deflatefilternote">DeflateFilterNote [<var>type</var>] <var>notename</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">ロギング用に圧縮比をメモに追加</td></tr> <tr class="odd"><td><a href="mod_deflate.html#deflateinflatelimitrequestbody">DeflateInflateLimitRequestBody<var>value</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum size of inflated request bodies</td></tr> -<tr><td><a href="mod_deflate.html#deflateinflateratioburst">DeflateInflateRatioBurst <var>value</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of times the inflation ratio for request bodies +<tr><td><a href="mod_deflate.html#deflateinflateratioburst">DeflateInflateRatioBurst <var>value</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of times the inflation ratio for request bodies can be crossed</td></tr> <tr class="odd"><td><a href="mod_deflate.html#deflateinflateratiolimit">DeflateInflateRatioLimit <var>value</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum inflation ratio for request bodies</td></tr> <tr><td><a href="mod_deflate.html#deflatememlevel">DeflateMemLevel <var>value</var></a></td><td> 9 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">zlib が圧縮に使うメモリのレベルを指定</td></tr> diff --git a/docs/manual/mod/quickreference.html.ko.euc-kr b/docs/manual/mod/quickreference.html.ko.euc-kr index 822ef46851..e18656f618 100644 --- a/docs/manual/mod/quickreference.html.ko.euc-kr +++ b/docs/manual/mod/quickreference.html.ko.euc-kr @@ -385,7 +385,7 @@ which no other media type configuration could be found. <tr class="odd"><td><a href="mod_deflate.html#deflatecompressionlevel">DeflateCompressionLevel <var>value</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4"> ϴ°</td></tr> <tr><td><a href="mod_deflate.html#deflatefilternote">DeflateFilterNote [<var>type</var>] <var>notename</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4"> α Ѵ</td></tr> <tr class="odd"><td><a href="mod_deflate.html#deflateinflatelimitrequestbody">DeflateInflateLimitRequestBody<var>value</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum size of inflated request bodies</td></tr> -<tr><td><a href="mod_deflate.html#deflateinflateratioburst">DeflateInflateRatioBurst <var>value</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of times the inflation ratio for request bodies +<tr><td><a href="mod_deflate.html#deflateinflateratioburst">DeflateInflateRatioBurst <var>value</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of times the inflation ratio for request bodies can be crossed</td></tr> <tr class="odd"><td><a href="mod_deflate.html#deflateinflateratiolimit">DeflateInflateRatioLimit <var>value</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum inflation ratio for request bodies</td></tr> <tr><td><a href="mod_deflate.html#deflatememlevel">DeflateMemLevel <var>value</var></a></td><td> 9 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">zlib Ҷ ϴ </td></tr> diff --git a/docs/manual/mod/quickreference.html.tr.utf8 b/docs/manual/mod/quickreference.html.tr.utf8 index 4bd578b99c..f7b32850d1 100644 --- a/docs/manual/mod/quickreference.html.tr.utf8 +++ b/docs/manual/mod/quickreference.html.tr.utf8 @@ -410,7 +410,7 @@ türünü belirlerdi.</td></tr> <tr class="odd"><td><a href="mod_deflate.html#deflatecompressionlevel">DeflateCompressionLevel <var>value</var></a></td><td></td><td>sk</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">How much compression do we apply to the output</td></tr> <tr><td><a href="mod_deflate.html#deflatefilternote">DeflateFilterNote [<var>type</var>] <var>notename</var></a></td><td></td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">Places the compression ratio in a note for logging</td></tr> <tr class="odd"><td><a href="mod_deflate.html#deflateinflatelimitrequestbody">DeflateInflateLimitRequestBody<var>value</var></a></td><td></td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum size of inflated request bodies</td></tr> -<tr><td><a href="mod_deflate.html#deflateinflateratioburst">DeflateInflateRatioBurst <var>value</var></a></td><td></td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of times the inflation ratio for request bodies +<tr><td><a href="mod_deflate.html#deflateinflateratioburst">DeflateInflateRatioBurst <var>value</var></a></td><td></td><td>skdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of times the inflation ratio for request bodies can be crossed</td></tr> <tr class="odd"><td><a href="mod_deflate.html#deflateinflateratiolimit">DeflateInflateRatioLimit <var>value</var></a></td><td></td><td>skdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum inflation ratio for request bodies</td></tr> <tr><td><a href="mod_deflate.html#deflatememlevel">DeflateMemLevel <var>value</var></a></td><td> 9 </td><td>sk</td><td>E</td></tr><tr><td class="descr" colspan="4">How much memory should be used by zlib for compression</td></tr> diff --git a/docs/manual/mod/quickreference.html.zh-cn.utf8 b/docs/manual/mod/quickreference.html.zh-cn.utf8 index 5644deb611..2cf159ef90 100644 --- a/docs/manual/mod/quickreference.html.zh-cn.utf8 +++ b/docs/manual/mod/quickreference.html.zh-cn.utf8 @@ -401,7 +401,7 @@ which no other media type configuration could be found. <tr class="odd"><td><a href="mod_deflate.html#deflatecompressionlevel">DeflateCompressionLevel <var>value</var></a></td><td></td><td>sv</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">How much compression do we apply to the output</td></tr> <tr><td><a href="mod_deflate.html#deflatefilternote">DeflateFilterNote [<var>type</var>] <var>notename</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Places the compression ratio in a note for logging</td></tr> <tr class="odd"><td><a href="mod_deflate.html#deflateinflatelimitrequestbody">DeflateInflateLimitRequestBody<var>value</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum size of inflated request bodies</td></tr> -<tr><td><a href="mod_deflate.html#deflateinflateratioburst">DeflateInflateRatioBurst <var>value</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of times the inflation ratio for request bodies +<tr><td><a href="mod_deflate.html#deflateinflateratioburst">DeflateInflateRatioBurst <var>value</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr><td class="descr" colspan="4">Maximum number of times the inflation ratio for request bodies can be crossed</td></tr> <tr class="odd"><td><a href="mod_deflate.html#deflateinflateratiolimit">DeflateInflateRatioLimit <var>value</var></a></td><td></td><td>svdh</td><td>E</td></tr><tr class="odd"><td class="descr" colspan="4">Maximum inflation ratio for request bodies</td></tr> <tr><td><a href="mod_deflate.html#deflatememlevel">DeflateMemLevel <var>value</var></a></td><td> 9 </td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">How much memory should be used by zlib for compression</td></tr> |