From: André Malo Date: Wed, 9 Mar 2016 22:07:25 +0000 (+0000) Subject: update transformation X-Git-Tag: 2.5.0-alpha~1929 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2aa87635751b155f51a5e9ffd991c0014392da1d;p=thirdparty%2Fapache%2Fhttpd.git update transformation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1734323 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/howto/http2.html b/docs/manual/howto/http2.html new file mode 100644 index 00000000000..7e5de6d3a00 --- /dev/null +++ b/docs/manual/howto/http2.html @@ -0,0 +1,5 @@ +# GENERATED FROM XML -- DO NOT EDIT + +URI: http2.html.en +Content-Language: en +Content-type: text/html; charset=ISO-8859-1 diff --git a/docs/manual/howto/http2.html.en b/docs/manual/howto/http2.html.en new file mode 100644 index 00000000000..de927bd6fba --- /dev/null +++ b/docs/manual/howto/http2.html.en @@ -0,0 +1,97 @@ + + + + + +HTTP/2 guide - Apache HTTP Server Version 2.5 + + + + + + +
+

Modules | Directives | FAQ | Glossary | Sitemap

+

Apache HTTP Server Version 2.5

+
+
<-
+
+Apache > HTTP Server > Documentation > Version 2.5 > How-To / Tutorials

HTTP/2 guide

+
+

Available Languages:  en  | + fr  | + ja  | + ko  | + tr 

+
+ +

This howto is still a work in progress! Please do not trust completely the following information until the work is finished.

+
+ +
top
+
+

The HTTP/2 protocol

+ +

This section should contain an overview of the protocol and links to official docs.

+
top
+
+

Build httpd with HTTP/2 support

+ +

This section should contain info about how to build HTTP/2 support into httpd plus other requirements.

+
top
+
+

Configurations

+ +

This section should contain various configuration examples for HTTP/2 (h2, h2c, etc..) plus common pitfalls (for example not setting a strong TLS cipher suite with h2).

+
top
+
+

Browsers

+ +

Browser support.

+
top
+
+

Useful tools to debug HTTP/2

+ +

This section should contain examples of tools to test/debug HTTP/2 connections.

+
+
+

Available Languages:  en  | + fr  | + ja  | + ko  | + tr 

+
top

Comments

Notice:
This is not a Q&A section. Comments placed here should be pointed towards suggestions on improving the documentation or server, and may be removed again by our moderators if they are either implemented or considered invalid/off-topic. Questions on how to manage the Apache HTTP Server should be directed at either our IRC channel, #httpd, on Freenode, or sent to our mailing lists.
+
+ \ No newline at end of file diff --git a/docs/manual/howto/http2.xml.meta b/docs/manual/howto/http2.xml.meta new file mode 100644 index 00000000000..c66c440320d --- /dev/null +++ b/docs/manual/howto/http2.xml.meta @@ -0,0 +1,12 @@ + + + + + http2 + /howto/ + .. + + + en + + diff --git a/docs/manual/mod/allmodules.xml b/docs/manual/mod/allmodules.xml index 21e7036ff07..32232fc4bf3 100644 --- a/docs/manual/mod/allmodules.xml +++ b/docs/manual/mod/allmodules.xml @@ -91,6 +91,7 @@ mod_proxy_hcheck.xml mod_proxy_html.xml mod_proxy_http.xml + mod_proxy_http2.xml mod_proxy_scgi.xml mod_proxy_wstunnel.xml mod_ratelimit.xml diff --git a/docs/manual/mod/allmodules.xml.de b/docs/manual/mod/allmodules.xml.de index b482637c542..3c09373bc72 100644 --- a/docs/manual/mod/allmodules.xml.de +++ b/docs/manual/mod/allmodules.xml.de @@ -91,6 +91,7 @@ mod_proxy_hcheck.xml mod_proxy_html.xml mod_proxy_http.xml + mod_proxy_http2.xml mod_proxy_scgi.xml mod_proxy_wstunnel.xml mod_ratelimit.xml diff --git a/docs/manual/mod/allmodules.xml.es b/docs/manual/mod/allmodules.xml.es index 07d00fb4bdc..36fe1716375 100644 --- a/docs/manual/mod/allmodules.xml.es +++ b/docs/manual/mod/allmodules.xml.es @@ -91,6 +91,7 @@ mod_proxy_hcheck.xml mod_proxy_html.xml mod_proxy_http.xml + mod_proxy_http2.xml mod_proxy_scgi.xml mod_proxy_wstunnel.xml mod_ratelimit.xml diff --git a/docs/manual/mod/allmodules.xml.fr b/docs/manual/mod/allmodules.xml.fr index 22673c625fb..e7a9250d4b5 100644 --- a/docs/manual/mod/allmodules.xml.fr +++ b/docs/manual/mod/allmodules.xml.fr @@ -91,6 +91,7 @@ mod_proxy_hcheck.xml mod_proxy_html.xml mod_proxy_http.xml.fr + mod_proxy_http2.xml mod_proxy_scgi.xml mod_proxy_wstunnel.xml mod_ratelimit.xml diff --git a/docs/manual/mod/allmodules.xml.ja b/docs/manual/mod/allmodules.xml.ja index 2d29d164af6..f3b241bdef4 100644 --- a/docs/manual/mod/allmodules.xml.ja +++ b/docs/manual/mod/allmodules.xml.ja @@ -91,6 +91,7 @@ mod_proxy_hcheck.xml mod_proxy_html.xml mod_proxy_http.xml + mod_proxy_http2.xml mod_proxy_scgi.xml mod_proxy_wstunnel.xml mod_ratelimit.xml diff --git a/docs/manual/mod/allmodules.xml.ko b/docs/manual/mod/allmodules.xml.ko index 1fadc0e4cf1..74a7f19b805 100644 --- a/docs/manual/mod/allmodules.xml.ko +++ b/docs/manual/mod/allmodules.xml.ko @@ -91,6 +91,7 @@ mod_proxy_hcheck.xml mod_proxy_html.xml mod_proxy_http.xml + mod_proxy_http2.xml mod_proxy_scgi.xml mod_proxy_wstunnel.xml mod_ratelimit.xml diff --git a/docs/manual/mod/allmodules.xml.tr b/docs/manual/mod/allmodules.xml.tr index 891ea3d0a01..cbf87ccc1e7 100644 --- a/docs/manual/mod/allmodules.xml.tr +++ b/docs/manual/mod/allmodules.xml.tr @@ -91,6 +91,7 @@ mod_proxy_hcheck.xml mod_proxy_html.xml mod_proxy_http.xml + mod_proxy_http2.xml mod_proxy_scgi.xml mod_proxy_wstunnel.xml mod_ratelimit.xml diff --git a/docs/manual/mod/allmodules.xml.zh-cn b/docs/manual/mod/allmodules.xml.zh-cn index 21e7036ff07..32232fc4bf3 100644 --- a/docs/manual/mod/allmodules.xml.zh-cn +++ b/docs/manual/mod/allmodules.xml.zh-cn @@ -91,6 +91,7 @@ mod_proxy_hcheck.xml mod_proxy_html.xml mod_proxy_http.xml + mod_proxy_http2.xml mod_proxy_scgi.xml mod_proxy_wstunnel.xml mod_ratelimit.xml diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index e54a706b6b2..75ece6173bc 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -4379,7 +4379,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 @@ -4472,10 +4472,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 @@ -4490,7 +4494,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 71b7dca37bd..f6499f2a8f3 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 b2a12b324e4..2e57e85e8a4 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 177e3de3837..bfee1499bd8 100644 --- a/docs/manual/mod/core.xml.ja +++ b/docs/manual/mod/core.xml.ja @@ -1,7 +1,7 @@ - + + +mod_proxy_http2 - Apache HTTP Server Version 2.5 + + + + + + + +
+

Modules | Directives | FAQ | Glossary | Sitemap

+

Apache HTTP Server Version 2.5

+
+
<-
+
+Apache > HTTP Server > Documentation > Version 2.5 > Modules
+
+

Apache Module mod_proxy_http2

+
+

Available Languages:  en 

+
+ + + +
Description:HTTP/2 support module for +mod_proxy
Status:Extension
Module Identifier:proxy_http2_module
Source File:mod_proxy_http2.c
+

Summary

+ +

This module requires the service of mod_proxy. It provides the features used for + proxying HTTP/2 requests. mod_proxy_http2 + supports HTTP/2 only. It does not + provide any downgrades to HTTP/1.1.

+ +

Thus, in order to get the ability of handling HTTP/2 proxy requests, + mod_proxy and mod_proxy_http2 + have to be present in the server.

+ +

mod_proxy_http2 works with incoming requests + over HTTP/1.1 and HTTP/2 requests. If mod_proxy_http2 + handles the frontend connection, requests against the same HTTP/2 + backend are sent over a single connection, whenever possible.

+ +

This module relies on libnghttp2 + to provide the core http/2 engine.

+ +

Warning

+

This module is experimental. Its behaviors, directives, and + defaults are subject to more change from release to + release relative to other standard modules. Users are encouraged to + consult the "CHANGES" file for potential updates.

+
+ +

Warning

+

Do not enable proxying until you have secured your server. Open proxy + servers are dangerous both to your network and to the Internet at + large.

+
+
+

Topics

+

Directives

+

This module provides no + directives.

+

See also

+
+
top
+
+

Request notes

+

mod_proxy_http creates the following request notes for + logging using the %{VARNAME}n format in + LogFormat or + ErrorLogFormat: +

+
+
proxy-source-port
+
The local port used for the connection to the backend server.
+
proxy-status
+
The HTTP/2 status received from the backend server.
+
+
+
+
+

Available Languages:  en 

+
top

Comments

Notice:
This is not a Q&A section. Comments placed here should be pointed towards suggestions on improving the documentation or server, and may be removed again by our moderators if they are either implemented or considered invalid/off-topic. Questions on how to manage the Apache HTTP Server should be directed at either our IRC channel, #httpd, on Freenode, or sent to our mailing lists.
+
+ \ No newline at end of file diff --git a/docs/manual/mod/mod_proxy_http2.xml.meta b/docs/manual/mod/mod_proxy_http2.xml.meta new file mode 100644 index 00000000000..2ccd79bba66 --- /dev/null +++ b/docs/manual/mod/mod_proxy_http2.xml.meta @@ -0,0 +1,12 @@ + + + + + mod_proxy_http2 + /mod/ + .. + + + en + + diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en index b83a61d7389..462583d564a 100644 --- a/docs/manual/mod/mod_rewrite.html.en +++ b/docs/manual/mod/mod_rewrite.html.en @@ -1339,17 +1339,25 @@ cannot use $N in the substitution string! ... + qslast|QSL + Interpret the last (right-most) question mark as the query string + delimeter, instead of the first (left-most) as normally used. + Available in 2.4.19 and later. + details + ... + + redirect|R[=code] Forces an external redirect, optionally with the specified HTTP status code. details ... - + skip|S=num Tells the rewriting engine to skip the next num rules if the current rule matches. details ... - + type|T=MIME-type Force the MIME-type of the target file to be the specified type. details ... diff --git a/docs/manual/mod/mod_rewrite.html.fr b/docs/manual/mod/mod_rewrite.html.fr index 1f016515ac4..9c50393b3a5 100644 --- a/docs/manual/mod/mod_rewrite.html.fr +++ b/docs/manual/mod/mod_rewrite.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_rewrite.xml.fr b/docs/manual/mod/mod_rewrite.xml.fr index 7740932e6f7..5d305b2b657 100644 --- a/docs/manual/mod/mod_rewrite.xml.fr +++ b/docs/manual/mod/mod_rewrite.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/mod/mod_rewrite.xml.meta b/docs/manual/mod/mod_rewrite.xml.meta index decc0a7b1e8..0be21e86f4d 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/rewrite/flags.html.en b/docs/manual/rewrite/flags.html.en index 11e306b2606..c20936bc865 100644 --- a/docs/manual/rewrite/flags.html.en +++ b/docs/manual/rewrite/flags.html.en @@ -51,6 +51,7 @@ providing detailed explanations and examples.

  • PT|passthrough
  • QSA|qsappend
  • QSD|qsdiscard
    • +
  • QSL|qslast
  • R|redirect
  • S|skip
  • T|type
    • @@ -620,6 +621,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 c519b265085..099f3ba3476 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 efb4eae283f..e9ac0305250 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 912229af035..e4f3ee6f495 100644 --- a/docs/manual/rewrite/flags.xml.meta +++ b/docs/manual/rewrite/flags.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/sitemap.html.de b/docs/manual/sitemap.html.de index 87c4c3cf990..f6cffeef4d6 100644 --- a/docs/manual/sitemap.html.de +++ b/docs/manual/sitemap.html.de @@ -282,6 +282,7 @@ HPUX betreiben

  • Apache-Modul mod_proxy_hcheck
  • Apache-Modul mod_proxy_html
  • Apache-Modul mod_proxy_http
    • +
  • Apache-Modul mod_proxy_http2
  • Apache-Modul mod_proxy_scgi
  • Apache-Modul mod_proxy_wstunnel
  • Apache-Modul mod_ratelimit
    • diff --git a/docs/manual/sitemap.html.en b/docs/manual/sitemap.html.en index ce9b4dc1754..9b8bb563198 100644 --- a/docs/manual/sitemap.html.en +++ b/docs/manual/sitemap.html.en @@ -280,6 +280,7 @@ log_server_status
  • Apache Module mod_proxy_hcheck
  • Apache Module mod_proxy_html
  • Apache Module mod_proxy_http
    • +
  • Apache Module mod_proxy_http2
  • Apache Module mod_proxy_scgi
  • Apache Module mod_proxy_wstunnel
  • Apache Module mod_ratelimit
    • diff --git a/docs/manual/sitemap.html.es b/docs/manual/sitemap.html.es index cf1483498d0..ae1828a47ea 100644 --- a/docs/manual/sitemap.html.es +++ b/docs/manual/sitemap.html.es @@ -257,6 +257,7 @@ usados para describir las directivas de Apache
  • Módulo Apache mod_proxy_hcheck
  • Módulo Apache mod_proxy_html
  • Módulo Apache mod_proxy_http
    • +
  • Módulo Apache mod_proxy_http2
  • Módulo Apache mod_proxy_scgi
  • Módulo Apache mod_proxy_wstunnel
  • Módulo Apache mod_ratelimit
    • diff --git a/docs/manual/sitemap.html.fr b/docs/manual/sitemap.html.fr index 6184ebe18d8..34acc5e748c 100644 --- a/docs/manual/sitemap.html.fr +++ b/docs/manual/sitemap.html.fr @@ -296,6 +296,7 @@ pour d
  • Module Apache mod_proxy_hcheck
  • Module Apache mod_proxy_html
  • Module Apache mod_proxy_http
    • +
  • Module Apache mod_proxy_http2
  • Module Apache mod_proxy_scgi
  • Module Apache mod_proxy_wstunnel
  • Module Apache mod_ratelimit
    • diff --git a/docs/manual/sitemap.html.ja.utf8 b/docs/manual/sitemap.html.ja.utf8 index 45b63a798d2..05d15fc43d8 100644 --- a/docs/manual/sitemap.html.ja.utf8 +++ b/docs/manual/sitemap.html.ja.utf8 @@ -257,6 +257,7 @@
  • Apache モジュール mod_proxy_hcheck
  • Apache モジュール mod_proxy_html
  • Apache モジュール mod_proxy_http
    • +
  • Apache モジュール mod_proxy_http2
  • Apache モジュール mod_proxy_scgi
  • Apache モジュール mod_proxy_wstunnel
  • Apache モジュール mod_ratelimit
    • diff --git a/docs/manual/sitemap.html.ko.euc-kr b/docs/manual/sitemap.html.ko.euc-kr index 52593871556..4b190c575ec 100644 --- a/docs/manual/sitemap.html.ko.euc-kr +++ b/docs/manual/sitemap.html.ko.euc-kr @@ -256,6 +256,7 @@
  • ¾ÆÆÄÄ¡ ¸ðµâ mod_proxy_hcheck
  • ¾ÆÆÄÄ¡ ¸ðµâ mod_proxy_html
  • ¾ÆÆÄÄ¡ ¸ðµâ mod_proxy_http
    • +
  • ¾ÆÆÄÄ¡ ¸ðµâ mod_proxy_http2
  • ¾ÆÆÄÄ¡ ¸ðµâ mod_proxy_scgi
  • ¾ÆÆÄÄ¡ ¸ðµâ mod_proxy_wstunnel
  • ¾ÆÆÄÄ¡ ¸ðµâ mod_ratelimit
    • diff --git a/docs/manual/sitemap.html.tr.utf8 b/docs/manual/sitemap.html.tr.utf8 index 6268afa7aa6..1265d8bd77b 100644 --- a/docs/manual/sitemap.html.tr.utf8 +++ b/docs/manual/sitemap.html.tr.utf8 @@ -259,6 +259,7 @@ Windows ile Apache Kullanımı
  • Apache Modülü mod_proxy_hcheck
  • Apache Modülü mod_proxy_html
  • Apache Modülü mod_proxy_http
    • +
  • Apache Modülü mod_proxy_http2
  • Apache Modülü mod_proxy_scgi
  • Apache Modülü mod_proxy_wstunnel
  • Apache Modülü mod_ratelimit
    • diff --git a/docs/manual/sitemap.html.zh-cn.utf8 b/docs/manual/sitemap.html.zh-cn.utf8 index 243f6b9a59b..f1bf965bff3 100644 --- a/docs/manual/sitemap.html.zh-cn.utf8 +++ b/docs/manual/sitemap.html.zh-cn.utf8 @@ -257,6 +257,7 @@
  • Apache 模块 mod_proxy_hcheck
  • Apache 模块 mod_proxy_html
  • Apache 模块 mod_proxy_http
    • +
  • Apache 模块 mod_proxy_http2
  • Apache 模块 mod_proxy_scgi
  • Apache 模块 mod_proxy_wstunnel
  • Apache 模块 mod_ratelimit
    • Description:Ce module fournit un moteur de réécriture à base de règles permettant de réécrire les URLs des requêtes à la volée