Date: Mon, 28 Sep 2015 19:26:41 +0000 (+0000) Subject: update transformation X-Git-Tag: 2.4.17~73 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ba79718ef48a57188d9ef9e14126e9d9485cdf0;p=thirdparty%2Fapache%2Fhttpd.git update transformation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1705750 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/convenience.map b/docs/manual/convenience.map index 7156659373b..298ad84ca7b 100644 --- a/docs/manual/convenience.map +++ b/docs/manual/convenience.map @@ -240,6 +240,15 @@ forensiclog mod/mod_log_forensic.html#forensiclog gprofdir mod/core.html#gprofdir gracefulshutdowntimeout mod/mpm_common.html#gracefulshutdowntimeout group mod/mod_unixd.html#group +h2direct mod/mod_h2.html#h2direct +h2maxsessionstreams mod/mod_h2.html#h2maxsessionstreams +h2maxworkeridleseconds mod/mod_h2.html#h2maxworkeridleseconds +h2maxworkers mod/mod_h2.html#h2maxworkers +h2minworkers mod/mod_h2.html#h2minworkers +h2serializeheaders mod/mod_h2.html#h2serializeheaders +h2sessionextrafiles mod/mod_h2.html#h2sessionextrafiles +h2streammaxmemsize mod/mod_h2.html#h2streammaxmemsize +h2windowsize mod/mod_h2.html#h2windowsize header mod/mod_headers.html#header headername mod/mod_autoindex.html#headername heartbeataddress mod/mod_heartbeat.html#heartbeataddress @@ -304,6 +313,7 @@ limitrequestline mod/core.html#limitrequestline limitxmlrequestbody mod/core.html#limitxmlrequestbody listen mod/mpm_common.html#listen listenbacklog mod/mpm_common.html#listenbacklog +listencoresbucketsratio mod/mpm_common.html#listencoresbucketsratio loadfile mod/mod_so.html#loadfile loadmodule mod/mod_so.html#loadmodule location mod/core.html#location @@ -368,6 +378,8 @@ pidfile mod/mpm_common.html#pidfile privilegesmode mod/mod_privileges.html#privilegesmode protocol mod/core.html#protocol protocolecho mod/mod_echo.html#protocolecho +protocols mod/core.html#protocols +protocolshonororder mod/core.html#protocolshonororder proxy mod/mod_proxy.html#proxy proxyaddheaders mod/mod_proxy.html#proxyaddheaders proxybadheader mod/mod_proxy.html#proxybadheader diff --git a/docs/manual/mod/allmodules.xml.de b/docs/manual/mod/allmodules.xml.de index 62e3941582e..4e701cfc6a7 100644 --- a/docs/manual/mod/allmodules.xml.de +++ b/docs/manual/mod/allmodules.xml.de @@ -51,6 +51,7 @@ mod_ext_filter.xml mod_file_cache.xml mod_filter.xml + mod_h2.xml mod_headers.xml mod_heartbeat.xml mod_heartmonitor.xml diff --git a/docs/manual/mod/allmodules.xml.es b/docs/manual/mod/allmodules.xml.es index 1f19997e1a1..7f3bbd844d1 100644 --- a/docs/manual/mod/allmodules.xml.es +++ b/docs/manual/mod/allmodules.xml.es @@ -51,6 +51,7 @@ mod_ext_filter.xml mod_file_cache.xml mod_filter.xml + mod_h2.xml mod_headers.xml mod_heartbeat.xml mod_heartmonitor.xml diff --git a/docs/manual/mod/allmodules.xml.fr b/docs/manual/mod/allmodules.xml.fr index ca2ea0f29ed..88c2b2d02e1 100644 --- a/docs/manual/mod/allmodules.xml.fr +++ b/docs/manual/mod/allmodules.xml.fr @@ -51,6 +51,7 @@ mod_ext_filter.xml.fr mod_file_cache.xml.fr mod_filter.xml.fr + mod_h2.xml mod_headers.xml.fr mod_heartbeat.xml.fr mod_heartmonitor.xml.fr diff --git a/docs/manual/mod/allmodules.xml.ja b/docs/manual/mod/allmodules.xml.ja index 6ee2af05a6f..3ac52d8c7d1 100644 --- a/docs/manual/mod/allmodules.xml.ja +++ b/docs/manual/mod/allmodules.xml.ja @@ -51,6 +51,7 @@ mod_ext_filter.xml.ja mod_file_cache.xml mod_filter.xml + mod_h2.xml mod_headers.xml.ja mod_heartbeat.xml mod_heartmonitor.xml diff --git a/docs/manual/mod/allmodules.xml.ko b/docs/manual/mod/allmodules.xml.ko index b309a252812..32eefea0c02 100644 --- a/docs/manual/mod/allmodules.xml.ko +++ b/docs/manual/mod/allmodules.xml.ko @@ -51,6 +51,7 @@ mod_ext_filter.xml.ko mod_file_cache.xml.ko mod_filter.xml + mod_h2.xml mod_headers.xml.ko mod_heartbeat.xml mod_heartmonitor.xml diff --git a/docs/manual/mod/allmodules.xml.tr b/docs/manual/mod/allmodules.xml.tr index 6cebe511f77..f9dc7dcc98c 100644 --- a/docs/manual/mod/allmodules.xml.tr +++ b/docs/manual/mod/allmodules.xml.tr @@ -51,6 +51,7 @@ mod_ext_filter.xml mod_file_cache.xml mod_filter.xml + mod_h2.xml mod_headers.xml mod_heartbeat.xml mod_heartmonitor.xml diff --git a/docs/manual/mod/allmodules.xml.zh-cn b/docs/manual/mod/allmodules.xml.zh-cn index 48e61762b67..fbc20266d19 100644 --- a/docs/manual/mod/allmodules.xml.zh-cn +++ b/docs/manual/mod/allmodules.xml.zh-cn @@ -51,6 +51,7 @@ mod_ext_filter.xml mod_file_cache.xml mod_filter.xml + mod_h2.xml mod_headers.xml mod_heartbeat.xml mod_heartmonitor.xml diff --git a/docs/manual/mod/core.html.de b/docs/manual/mod/core.html.de index 809bfb4ca64..49dfe146b45 100644 --- a/docs/manual/mod/core.html.de +++ b/docs/manual/mod/core.html.de @@ -100,6 +100,8 @@ Servers

Options

Protocol

Protocols

@@ -2726,6 +2728,40 @@ On Windows, from Apache 2.3.3 and later.

Protocols-Direktive

+ + + + + + + + +

Beschreibung:	Protocols available for a server/virtual host
Syntax:	`Protocols protocol ...`
Voreinstellung:	`Protocols http/1.1`
Kontext:	Serverkonfiguration, Virtual Host
Status:	Core
Modul:	core
Kompatibilität:	Only available from Apache 2.4.17 and later.

Die Dokumentation zu dieser Direktive wurde + noch nicht übersetzt. Bitte schauen Sie in die englische + Version.

Siehe auch

ProtocolsHonorOrder

ProtocolsHonorOrder-Direktive

+ + + + + + + + +

Beschreibung:	Protocols available for a server/virtual host
Syntax:	`ProtocolsHonorOrder On\|Off`
Voreinstellung:	`ProtocolsHonorOrder On`
Kontext:	Serverkonfiguration, Virtual Host
Status:	Core
Modul:	core
Kompatibilität:	Only available from Apache 2.4.17 and later.

Die Dokumentation zu dieser Direktive wurde + noch nicht übersetzt. Bitte schauen Sie in die englische + Version.

Siehe auch

Protocols

RLimitCPU-Direktive

@@ -3590,6 +3592,79 @@ On Windows, from Apache 2.3.3 and later.

Protocols Directive

Beschreibung:	Begrenzt den CPU-Verbrauch von Prozessen, die von diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index 84e26161976..e80eac85c01 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -97,6 +97,8 @@ available

+ + + + + + + +

Description:	Protocols available for a server/virtual host
Syntax:	`Protocols protocol ...`
Default:	`Protocols http/1.1`
Context:	server config, virtual host
Status:	Core
Module:	core
Compatibility:	Only available from Apache 2.4.17 and later.

This directive specifies the list of protocols supported for a + server/virtual host. The list determines the allowed protocols + a client may negotiate for this server/host.

+ +

You need to set protocols if you want to extend the available + protocols for a server/host. By default, only the http/1.1 protocol + (which includes the compatibility with 1.0 and 0.9 clients) is + allowed.

+ +

For example, if you want to support HTTP/2 for a server with TLS, + specify:

+ +

Protocols h2 http/1.1

+ + +

Valid protocols are http/1.1 for http and https connections, + h2 on https connections and h2c for http + connections. Modules may enable more protocols.

+ +

It is safe to specify protocols that are unavailable/disabled. Such + protocol names will simply be ignored.

+ +

Protocols specified in base servers are inherited for virtual hosts + only if the virtual host has no own Protocols directive. Or, the other + way around, Protocols directives in virtual hosts replace any + such directive in the base server. +

+ + +

ProtocolsHonorOrder Directive

+ + + + + + + + +

Description:	Protocols available for a server/virtual host
Syntax:	`ProtocolsHonorOrder On\|Off`
Default:	`ProtocolsHonorOrder On`
Context:	server config, virtual host
Status:	Core
Module:	core
Compatibility:	Only available from Apache 2.4.17 and later.

This directive specifies if the server should honor the order in which + the Protocols directive lists protocols.

+ +

If configured Off, the client supplied list order of protocols has + precedence over the order in the server configuration.

+ +

With ProtocolsHonorOrder set to on + (default), the client ordering does not matter and only the ordering + in the server settings influences the outcome of the protocol + negotiation.

+ + +

RLimitCPU Directive

Protocols Directiva

Description:	Limits the CPU consumption of processes launched diff --git a/docs/manual/mod/core.html.es b/docs/manual/mod/core.html.es index adf7d59614a..59d15487f46 100644 --- a/docs/manual/mod/core.html.es +++ b/docs/manual/mod/core.html.es @@ -100,6 +100,8 @@ NameVirtualHost Options Protocol + Protocols + ProtocolsHonorOrder RLimitCPU RLimitMEM RLimitNPROC @@ -3371,6 +3373,40 @@ On Windows from Apache 2.3.3 and later.

Description:

Limits the CPU consumption of processes launched diff --git a/docs/manual/mod/core.html.es b/docs/manual/mod/core.html.es index adf7d59614a..59d15487f46 100644 --- a/docs/manual/mod/core.html.es +++ b/docs/manual/mod/core.html.es @@ -100,6 +100,8 @@

@@ -3371,6 +3373,40 @@ On Windows from Apache 2.3.3 and later.

+ + + + + + + +

Descripción:	Protocols available for a server/virtual host
Sintaxis:	`Protocols protocol ...`
Valor por defecto:	`Protocols http/1.1`
Contexto:	server config, virtual host
Estado:	Core
Módulo:	core
Compatibilidad:	Only available from Apache 2.4.17 and later.

The documentation for this directive has + not been translated yet. Please have a look at the English + version.

Consulte también

ProtocolsHonorOrder

ProtocolsHonorOrder Directiva

+ + + + + + + + +

Descripción:	Protocols available for a server/virtual host
Sintaxis:	`ProtocolsHonorOrder On\|Off`
Valor por defecto:	`ProtocolsHonorOrder On`
Contexto:	server config, virtual host
Estado:	Core
Módulo:	core
Compatibilidad:	Only available from Apache 2.4.17 and later.

The documentation for this directive has + not been translated yet. Please have a look at the English + version.

Consulte también

Protocols

RLimitCPU Directiva

@@ -3855,6 +3859,40 @@ seulement depuis la version 2.3.3 sous Windows.

Directive Protocols

Descripción:

Limits the CPU consumption of processes launched diff --git a/docs/manual/mod/core.html.fr b/docs/manual/mod/core.html.fr index 65c57bc3a0a..54989cd4063 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

@@ -97,6 +99,8 @@ disponibles

+ + + + + + + +

Description:	Protocols available for a server/virtual host
Syntaxe:	`Protocols protocol ...`
Défaut:	`Protocols http/1.1`
Contexte:	configuration du serveur, serveur virtuel
Statut:	Core
Module:	core
Compatibilité:	Only available from Apache 2.4.17 and later.

La documentation de cette directive + n'a pas encore t traduite. Veuillez vous reporter la version + en langue anglaise.

Voir aussi

ProtocolsHonorOrder

Directive ProtocolsHonorOrder

+ + + + + + + + +

Description:	Protocols available for a server/virtual host
Syntaxe:	`ProtocolsHonorOrder On\|Off`
Défaut:	`ProtocolsHonorOrder On`
Contexte:	configuration du serveur, serveur virtuel
Statut:	Core
Module:	core
Compatibilité:	Only available from Apache 2.4.17 and later.

La documentation de cette directive + n'a pas encore t traduite. Veuillez vous reporter la version + en langue anglaise.

Voir aussi

Protocols

Directive RLimitCPU

Protocols ãã£ã¬ã¯ãã£ã

Description:	Limite le temps CPU alloué aux processus initiés par les diff --git a/docs/manual/mod/core.html.ja.utf8 b/docs/manual/mod/core.html.ja.utf8 index 020eddb2be7..cdc699cd717 100644 --- a/docs/manual/mod/core.html.ja.utf8 +++ b/docs/manual/mod/core.html.ja.utf8 @@ -100,6 +100,8 @@ NameVirtualHost Options Protocol + Protocols + ProtocolsHonorOrder RLimitCPU RLimitMEM RLimitNPROC @@ -2668,6 +2670,40 @@ On Windows, from Apache 2.3.3 and later.

Description:

Limite le temps CPU alloué aux processus initiés par les diff --git a/docs/manual/mod/core.html.ja.utf8 b/docs/manual/mod/core.html.ja.utf8 index 020eddb2be7..cdc699cd717 100644 --- a/docs/manual/mod/core.html.ja.utf8 +++ b/docs/manual/mod/core.html.ja.utf8 @@ -100,6 +100,8 @@

@@ -2668,6 +2670,40 @@ On Windows, from Apache 2.3.3 and later.

+ + + + + + + +

èª¬æ:	Protocols available for a server/virtual host
æ§æ:	`Protocols protocol ...`
ããã©ã«ã:	`Protocols http/1.1`
ã³ã³ããã¹ã:	ãµã¼ãè¨å®ãã¡ã¤ã«, ãã¼ãã£ã«ãã¹ã
ã¹ãã¼ã¿ã¹:	Core
ã¢ã¸ã¥ã¼ã«:	core
äºææ§:	Only available from Apache 2.4.17 and later.

åç§

ProtocolsHonorOrder

ProtocolsHonorOrder ãã£ã¬ã¯ãã£ã

+ + + + + + + + +

èª¬æ:	Protocols available for a server/virtual host
æ§æ:	`ProtocolsHonorOrder On\|Off`
ããã©ã«ã:	`ProtocolsHonorOrder On`
ã³ã³ããã¹ã:	ãµã¼ãè¨å®ãã¡ã¤ã«, ãã¼ãã£ã«ãã¹ã
ã¹ãã¼ã¿ã¹:	Core
ã¢ã¸ã¥ã¼ã«:	core
äºææ§:	Only available from Apache 2.4.17 and later.

åç§

Protocols

RLimitCPU ãã£ã¬ã¯ãã£ã

èª¬æ:

Apache ã®åããã»ã¹ããèµ·åãããããã»ã¹ã® CPU æ¶è²»éã diff --git a/docs/manual/mod/core.html.tr.utf8 b/docs/manual/mod/core.html.tr.utf8 index c5dbea2de23..3d428487f9c 100644 --- a/docs/manual/mod/core.html.tr.utf8 +++ b/docs/manual/mod/core.html.tr.utf8 @@ -98,6 +98,8 @@

@@ -3568,6 +3570,38 @@ Mutex fcntl:/var/httpd/locks mpm-accept

Protocols YÃ¶nergesi

+ + + + + + + + +

AÃ§Ä±klama:	Protocols available for a server/virtual host
SÃ¶zdizimi:	`Protocols protocol ...`
ÃntanÄ±mlÄ±:	`Protocols http/1.1`
BaÄlam:	sunucu geneli, sanal konak
Durum:	Ãekirdek
ModÃ¼l:	core
Uyumluluk:	Only available from Apache 2.4.17 and later.

Bu yÃ¶nergenin belgesi henÃ¼z TÃ¼rkÃ§eye Ã§evrilmedi. + LÃ¼tfen Ä°ngilizce sÃ¼rÃ¼mÃ¼ne bakÄ±nÄ±z.

AyrÄ±ca bakÄ±nÄ±z:

ProtocolsHonorOrder

ProtocolsHonorOrder YÃ¶nergesi

+ + + + + + + + +

AÃ§Ä±klama:	Protocols available for a server/virtual host
SÃ¶zdizimi:	`ProtocolsHonorOrder On\|Off`
ÃntanÄ±mlÄ±:	`ProtocolsHonorOrder On`
BaÄlam:	sunucu geneli, sanal konak
Durum:	Ãekirdek
ModÃ¼l:	core
Uyumluluk:	Only available from Apache 2.4.17 and later.

Bu yÃ¶nergenin belgesi henÃ¼z TÃ¼rkÃ§eye Ã§evrilmedi. + LÃ¼tfen Ä°ngilizce sÃ¼rÃ¼mÃ¼ne bakÄ±nÄ±z.

AyrÄ±ca bakÄ±nÄ±z:

Protocols

RLimitCPU YÃ¶nergesi

AÃ§Ä±klama:

Apache httpd alt sÃ¼reÃ§leri tarafÄ±ndan Ã§alÄ±ÅtÄ±rÄ±lan sÃ¼reÃ§lerin diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de index 81b93aa93dc..38ec7857e4a 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 a5d9b84c0bf..b67485d0a7e 100644 --- a/docs/manual/mod/core.xml.ja +++ b/docs/manual/mod/core.xml.ja @@ -1,7 +1,7 @@ - + + -mod_h2 - Apache HTTP Server Version 2.5 +mod_h2 - Apache HTTP Server Version 2.4 @@ -17,12 +17,12 @@

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

+Apache > HTTP Server > Documentation > Version 2.4 > Modules

Apache Module mod_h2

@@ -43,12 +43,7 @@

Comments

H2BufferOutput Directive

- - - - - - -

Description:	Output Buffering Switch
Syntax:	`H2BufferOutput on\|off`
Context:	server config, virtual host
Status:	Extension
Module:	mod_h2

- This directive toggles if buffering of HTTP/2 output shall be used - or if data is written immediately when it arrives. Unless specified - otherwise, this directive is on for TLS connections and - off for plain connections. -

Example

H2BufferOutput on

- -

H2BufferSize Directive

- - - - - - - -

Description:	Buffer size for outgoing data per HTTP/2 connection.
Syntax:	`H2BufferSize bytes`
Default:	`H2BufferSize 65536`
Context:	server config, virtual host
Status:	Extension
Module:	mod_h2

- This directive sets the size of the buffer used to hold outgoing - HTTP/2 raw data, should H2BufferOutput be switched on. - This data is allocated per HTTP/2 connection, not stream and is - counted against the raw protocol data. -

Example

H2BufferSize 128000

- -

H2BufferWriteMax Directive

- - - - - - - -

Description:	Maximum size of write on a HTTP/2 connection.
Syntax:	`H2BufferWriteMax bytes`
Default:	`H2BufferWriteMax 16384`
Context:	server config, virtual host
Status:	Extension
Module:	mod_h2

- This directive sets maximum amount of data sent out in a single - write on a http/2 connection. It only takes effect when - H2BufferOutput is switched on. -

- This directive affects performance of underlying TLS transports. TLS - transforms each write into an encrypted record. Clients need - to receive all of the record in order to decrypt it. Larger sizes - result in better server performance, shorter sizes can affect web - page paint timings. -

- BufferSize should be a multiple of H2BufferWriteMax. - H2BufferWriteMax, if larger than 16k, should be a multiple of 16k, - since this is the TLS max record size. Be aware that there are TLS - extensions to limit the record size to powers of 2 less than 16k. -

Example

H2BufferWriteMax 8000

- -

H2Direct Directive

- + @@ -154,54 +80,6 @@

Example

H2Direct on

- -

H2Engine Directive

Description:	H2 Direct Protocol Switch
Syntax:	`H2Direct on\|off`
Default:	`H2Direct on`
Default:	`H2Direct on (for non TLS)`
Context:	server config, virtual host
Status:	Extension
Module:	mod_h2

- - - - - - -

Description:	H2 Engine Operation Switch
Syntax:	`H2Engine on\|off`
Default:	`H2Engine off`
Context:	server config, virtual host
Status:	Extension
Module:	mod_h2

- This directive toggles the usage of the HTTP/2 Protocol Engine. This - should be used inside a - <VirtualHost> - section to enable HTTP/2 for that virtual host. By default the - HTTP/2 Protocol Engine is disabled for both the main server and all - configured virtual hosts. -

Example

<VirtualHost _default_:443>
-    H2Engine on
-    #...
-</VirtualHost>

- The HTTP/2 engine is usable in TLS and plain scenarios, supporting - the 'h2' and 'h2c' variants of the protocol. -

- -

H2MaxHeaderListSize Directive

- - - - - - - -

Description:	Maximum size of acceptable stream headers.
Syntax:	`H2MaxHeaderListSize bytes`
Default:	`H2MaxHeaderListSize 16384`
Context:	server config, virtual host
Status:	Extension
Module:	mod_h2

- This directive sets the maximum amount of stream header bytes that - the server is willing to accept. It is announced to the client during - the initial HTTP/2 handshake. -

Example

H2MaxHeaderListSize 10000

H2MaxSessionStreams Directive

@@ -385,7 +263,7 @@

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.

Protocols-Direktive

Siehe auch

ProtocolsHonorOrder-Direktive

Siehe auch

RLimitCPU-Direktive

See also

See also

Consulte también

Consulte también

Voir aussi

Voir aussi

åç §

åç §

AyrÄ±ca bakÄ±nÄ±z:

AyrÄ±ca bakÄ±nÄ±z:

Apache Module mod_h2

Directives

Example

Example

Example

Example

Example

Example

åç§

åç§