From e62e6055baa3ef2fe944c87297f7631ea92d8416 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Malo?= Date: Wed, 9 Mar 2016 22:40:45 +0000 Subject: [PATCH] update transformation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1734331 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/convenience.map | 1 + docs/manual/mod/core.html.en | 14 +++++++++----- docs/manual/mod/core.html.fr | 2 ++ docs/manual/mod/core.xml.de | 2 +- docs/manual/mod/core.xml.es | 2 +- docs/manual/mod/core.xml.fr | 2 +- docs/manual/mod/core.xml.ja | 2 +- docs/manual/mod/core.xml.meta | 2 +- docs/manual/mod/core.xml.tr | 2 +- docs/manual/mod/mod_rewrite.html.en | 12 ++++++++++-- docs/manual/mod/mod_rewrite.html.fr | 2 ++ docs/manual/mod/mod_rewrite.xml.fr | 2 +- docs/manual/mod/mod_rewrite.xml.meta | 2 +- docs/manual/mod/mod_ssl.html.fr | 2 ++ docs/manual/mod/mod_ssl.xml.fr | 2 +- docs/manual/mod/mod_ssl.xml.meta | 2 +- docs/manual/rewrite/flags.html.en | 17 +++++++++++++++++ docs/manual/rewrite/flags.html.fr | 2 ++ docs/manual/rewrite/flags.xml.fr | 2 +- docs/manual/rewrite/flags.xml.meta | 2 +- 20 files changed, 57 insertions(+), 19 deletions(-) diff --git a/docs/manual/convenience.map b/docs/manual/convenience.map index 0491050b74..ba77970897 100644 --- a/docs/manual/convenience.map +++ b/docs/manual/convenience.map @@ -550,6 +550,7 @@ sslinsecurerenegotiation mod/mod_ssl.html#sslinsecurerenegotiation sslocspdefaultresponder mod/mod_ssl.html#sslocspdefaultresponder sslocspenable mod/mod_ssl.html#sslocspenable sslocspoverrideresponder mod/mod_ssl.html#sslocspoverrideresponder +sslocspproxyurl mod/mod_ssl.html#sslocspproxyurl sslocsprespondertimeout mod/mod_ssl.html#sslocsprespondertimeout sslocspresponsemaxage mod/mod_ssl.html#sslocspresponsemaxage sslocspresponsetimeskew mod/mod_ssl.html#sslocspresponsetimeskew diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index 5dc2336a0b..9bb153461d 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -4267,7 +4267,7 @@ handler 
<LocationMatch ^/app/(?<sub>[^/]+)/>
      SetHandler "proxy:unix:/var/run/app_%{env:MATCH_sub}.sock|fcgi://localhost:8080"
-</FilesMatch>
+</LocationMatch>

You can override an earlier defined SetHandler @@ -4360,10 +4360,14 @@ certain events before failing a request

The TimeOut directive defines the length of time Apache httpd will wait for I/O in various circumstances:

-
    -
  1. When reading data from the client, the length of time to +
      +

    • When reading data from the client, the length of time to wait for a TCP packet to arrive if the read buffer is - empty.

      • + empty.

      +

      For initial data on a new connection, this directive doesn't + take effect until after any configured + AcceptFilter has passed the new connection to the server.

      +
    • When writing data to the client, the length of time to wait for an acknowledgement of a packet if the send buffer is @@ -4378,7 +4382,7 @@ certain events before failing a request
    • In mod_proxy, the default timeout value if ProxyTimeout is not configured.
      • -
+ diff --git a/docs/manual/mod/core.html.fr b/docs/manual/mod/core.html.fr index c335afad7f..a78eaa940f 100644 --- a/docs/manual/mod/core.html.fr +++ b/docs/manual/mod/core.html.fr @@ -33,6 +33,8 @@  ja  |  tr 

+
Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.
Description:Fonctionnalités de base du serveur HTTP Apache toujours disponibles
Statut:Core
diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de index 4b615d0e13..5e342ef32a 100644 --- a/docs/manual/mod/core.xml.de +++ b/docs/manual/mod/core.xml.de @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja index 8b47c2f5ea..2ec50f6d8b 100644 --- a/docs/manual/mod/core.xml.ja +++ b/docs/manual/mod/core.xml.ja @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/mod_rewrite.xml.meta b/docs/manual/mod/mod_rewrite.xml.meta index decc0a7b1e..0be21e86f4 100644 --- a/docs/manual/mod/mod_rewrite.xml.meta +++ b/docs/manual/mod/mod_rewrite.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/mod/mod_ssl.html.fr b/docs/manual/mod/mod_ssl.html.fr index fb4538b2e0..745cff2465 100644 --- a/docs/manual/mod/mod_ssl.html.fr +++ b/docs/manual/mod/mod_ssl.html.fr @@ -29,6 +29,8 @@

Langues Disponibles:  en  |  fr 

+
Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.
diff --git a/docs/manual/mod/mod_ssl.xml.fr b/docs/manual/mod/mod_ssl.xml.fr index 368eaaea10..fe038276a8 100644 --- a/docs/manual/mod/mod_ssl.xml.fr +++ b/docs/manual/mod/mod_ssl.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_ssl.xml.meta b/docs/manual/mod/mod_ssl.xml.meta index 736a11a017..be20a51f56 100644 --- a/docs/manual/mod/mod_ssl.xml.meta +++ b/docs/manual/mod/mod_ssl.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/rewrite/flags.html.en b/docs/manual/rewrite/flags.html.en index 0dc06f7190..d48dde1450 100644 --- a/docs/manual/rewrite/flags.html.en +++ b/docs/manual/rewrite/flags.html.en @@ -50,6 +50,7 @@ providing detailed explanations and examples.

  • PT|passthrough
  • QSA|qsappend
  • QSD|qsdiscard
    • +
  • QSL|qslast
  • R|redirect
  • S|skip
  • T|type
    • @@ -608,6 +609,22 @@ replaced with the query string in the RewriteRule target URI.

    +
    top
    +
    +

    QSL|qslast

    +

    +By default, the first (left-most) question mark in the substitution +delimits the path from the query string. Using the [QSL] flag instructs +RewriteRule to instead split +the two components using the last (right-most) question mark.

    + +

    +This is useful when mapping to files that have literal question marks in +their filename. If no query string is used in the substitution, +a question mark can be appended to it in combination with this flag.

    + +

    This flag is available in version 2.4.19 and later.

    +
    top

    R|redirect

    diff --git a/docs/manual/rewrite/flags.html.fr b/docs/manual/rewrite/flags.html.fr index 5ddcf40b49..96ea319e4d 100644 --- a/docs/manual/rewrite/flags.html.fr +++ b/docs/manual/rewrite/flags.html.fr @@ -26,6 +26,8 @@

    Langues Disponibles:  en  |  fr 

    +
    Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.

    Ce document décrit les drapeaux disponibles dans la directive RewriteRule, en fournissant diff --git a/docs/manual/rewrite/flags.xml.fr b/docs/manual/rewrite/flags.xml.fr index 30ce2294e3..4201d2089b 100644 --- a/docs/manual/rewrite/flags.xml.fr +++ b/docs/manual/rewrite/flags.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/rewrite/flags.xml.meta b/docs/manual/rewrite/flags.xml.meta index 912229af03..e4f3ee6f49 100644 --- a/docs/manual/rewrite/flags.xml.meta +++ b/docs/manual/rewrite/flags.xml.meta @@ -8,6 +8,6 @@ en - fr + fr -- 2.40.0

    Description:Chiffrement de haut niveau basé sur les protocoles Secure Sockets Layer (SSL) et Transport Layer Security (TLS)
    Statut:Extension