diff options
Diffstat (limited to '')
| -rw-r--r-- | docs/manual/mod/mod_filter.html.en | 28 | ||||
| -rw-r--r-- | docs/manual/mod/mod_ssl.html.en | 5 | ||||
| -rw-r--r-- | docs/manual/new_features_2_4.html.en | 2 | ||||
| -rw-r--r-- | docs/manual/upgrading.html.en | 6 | ||||
| -rw-r--r-- | docs/manual/upgrading.html.fr | 2 | ||||
| -rw-r--r-- | docs/manual/upgrading.xml.fr | 2 | ||||
| -rw-r--r-- | docs/manual/upgrading.xml.meta | 2 |
7 files changed, 21 insertions, 26 deletions
diff --git a/docs/manual/mod/mod_filter.html.en b/docs/manual/mod/mod_filter.html.en index 6775554d2f..80c54f8155 100644 --- a/docs/manual/mod/mod_filter.html.en +++ b/docs/manual/mod/mod_filter.html.en @@ -72,13 +72,9 @@ <p><code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code> by contrast gives server administrators a great deal of flexibility in configuring the filter chain. In fact, - filters can be inserted based on any Request Header, Response Header - or Environment Variable. This generalises the limited flexibility offered - by <code class="directive">AddOutputFilterByType</code>, and fixes - it to work correctly with dynamic content, regardless of the - content generator. The ability to dispatch based on Environment - Variables offers the full flexibility of configuration with - <code class="module"><a href="../mod/mod_rewrite.html">mod_rewrite</a></code> to anyone who needs it.</p> + filters can be inserted based on complex boolean + <a href="../expr.html">expressions</a> This generalises the limited + flexibility offered by <code class="directive">AddOutputFilterByType</code>.</p> </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> <div class="section"> <h2><a name="terms" id="terms">Filter Declarations, Providers and Chains</a></h2> @@ -275,12 +271,11 @@ <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>FileInfo</td></tr> <tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Base</td></tr> <tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_filter</td></tr> -<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in Apache httpd 2.0.33 and later; deprecated in Apache httpd 2.1 and later</td></tr> +<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Version 2.0.33 and later; had severe limitations before +being moved to <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code> in version 2.3.7</td></tr> </table> <p>This directive activates a particular output <a href="../filter.html">filter</a> for a request depending on the - response <a class="glossarylink" href="../glossary.html#media-type" title="see glossary">media-type</a>. Because of certain - problems discussed below, this directive is deprecated. The same - functionality is available using <code class="module"><a href="../mod/mod_filter.html">mod_filter</a></code>.</p> + response <a class="glossarylink" href="../glossary.html#media-type" title="see glossary">media-type</a>.</p> <p>The following example uses the <code>DEFLATE</code> filter, which is provided by <code class="module"><a href="../mod/mod_deflate.html">mod_deflate</a></code>. It will compress all @@ -311,17 +306,6 @@ </Location> </code></p></div> - <div class="warning"><h3>Note</h3> - <p>Enabling filters with <code class="directive">AddOutputFilterByType</code> - may fail partially or completely in some cases. For example, no - filters are applied if the <a class="glossarylink" href="../glossary.html#media-type" title="see glossary">media-type</a> could not - be determined. If you want to make sure that the filters will be - applied, assign the content type to a resource explicitly; for - example, with <code class="directive"><a href="../mod/mod_mime.html#addtype">AddType</a></code> or - <code class="directive"><a href="../mod/core.html#forcetype">ForceType</a></code>. Setting the - content type within a (non-nph) CGI script is also safe.</p> - - </div> <h3>See also</h3> <ul> diff --git a/docs/manual/mod/mod_ssl.html.en b/docs/manual/mod/mod_ssl.html.en index 0d417db1d5..dbb12cc9f5 100644 --- a/docs/manual/mod/mod_ssl.html.en +++ b/docs/manual/mod/mod_ssl.html.en @@ -1456,6 +1456,11 @@ This referenced file is simply the concatenation of the various PEM-encoded certificate files. Upon startup, each client certificate configured will be examined and a chain of trust will be constructed. </p> +<div class="warning"><h3>Security warning</h3> +<p>If this directive is enabled, all of the certificates in the file will be +trusted as if they were also in <code class="directive"><a href="# sslproxycacertificatefile"> +SSLProxyCACertificateFile</a></code>.</p> +</div> <div class="example"><h3>Example</h3><p><code> SSLProxyMachineCertificateChainFile /usr/local/apache2/conf/ssl.crt/proxyCA.pem </code></p></div> diff --git a/docs/manual/new_features_2_4.html.en b/docs/manual/new_features_2_4.html.en index 2ca9f2b8e5..fe73ad4b7a 100644 --- a/docs/manual/new_features_2_4.html.en +++ b/docs/manual/new_features_2_4.html.en @@ -251,7 +251,7 @@ <dd>We now have a general-purpose expression parser, whose API is exposed in <var>ap_expr.h</var>. This is adapted from the expression parser previously implemented in - <code class="module"><a href="./mod/mod_include.html">mod_include</a></code>.</dd> + <code class="module"><a href="./mod/mod_ssl.html">mod_ssl</a></code>.</dd> <dt>Authorization Logic Containers</dt> diff --git a/docs/manual/upgrading.html.en b/docs/manual/upgrading.html.en index 9b1edbef63..0f5f696c96 100644 --- a/docs/manual/upgrading.html.en +++ b/docs/manual/upgrading.html.en @@ -265,8 +265,12 @@ warning. Any address/port combination appearing in multiple virtual hosts is implicitly treated as a name-based virtual host. </li> + + <li><code class="module"><a href="./mod/mod_deflate.html">mod_deflate</a></code> will now skip compression if it knows + that the size overhead added by the compression is larger than the data + to be compressed. + </li> </ul> - </div><div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div> <div class="section"> diff --git a/docs/manual/upgrading.html.fr b/docs/manual/upgrading.html.fr index f370fa547c..30760f2f87 100644 --- a/docs/manual/upgrading.html.fr +++ b/docs/manual/upgrading.html.fr @@ -21,6 +21,8 @@ <p><span>Langues Disponibles: </span><a href="./en/upgrading.html" hreflang="en" rel="alternate" title="English"> en </a> | <a href="./fr/upgrading.html" title="Français"> fr </a></p> </div> +<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.</div> <p>Afin d'assister les utilisateurs lors de leurs opérations de mise à jour, nous maintenons un document diff --git a/docs/manual/upgrading.xml.fr b/docs/manual/upgrading.xml.fr index 256beafdab..eac0d55db2 100644 --- a/docs/manual/upgrading.xml.fr +++ b/docs/manual/upgrading.xml.fr @@ -3,7 +3,7 @@ <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> -<!-- English Revision: 1137744 --> +<!-- English Revision: 1137744:1170338 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/upgrading.xml.meta b/docs/manual/upgrading.xml.meta index aba29996bb..1d2a68a225 100644 --- a/docs/manual/upgrading.xml.meta +++ b/docs/manual/upgrading.xml.meta @@ -8,6 +8,6 @@ <variants> <variant>en</variant> - <variant>fr</variant> + <variant outdated="yes">fr</variant> </variants> </metafile> |