From: Andre Malo Date: Fri, 18 Jul 2014 20:32:00 +0000 (+0000) Subject: update transformation X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fdc044121e7cc8529e35bed2dda4fbdb7f04eb0;p=thirdparty%2Fapache%2Fhttpd.git update transformation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1611793 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/convenience.map b/docs/manual/convenience.map index cb20c690d06..39051dbb125 100644 --- a/docs/manual/convenience.map +++ b/docs/manual/convenience.map @@ -206,6 +206,9 @@ deflatealteretag mod/mod_deflate.html#deflatealteretag deflatebuffersize mod/mod_deflate.html#deflatebuffersize deflatecompressionlevel mod/mod_deflate.html#deflatecompressionlevel deflatefilternote mod/mod_deflate.html#deflatefilternote +deflateinflatelimitrequestbody mod/mod_deflate.html#deflateinflatelimitrequestbody +deflateinflateratioburst mod/mod_deflate.html#deflateinflateratioburst +deflateinflateratiolimit mod/mod_deflate.html#deflateinflateratiolimit deflatememlevel mod/mod_deflate.html#deflatememlevel deflatewindowsize mod/mod_deflate.html#deflatewindowsize deny mod/mod_access_compat.html#deny @@ -288,6 +291,7 @@ isapicachefile mod/mod_isapi.html#isapicachefile isapifakeasync mod/mod_isapi.html#isapifakeasync isapilognotsupported mod/mod_isapi.html#isapilognotsupported isapireadaheadbuffer mod/mod_isapi.html#isapireadaheadbuffer +journaldcustomlog mod/mod_journald.html#journaldcustomlog keepalive mod/core.html#keepalive keepalivetimeout mod/core.html#keepalivetimeout keptbodysize mod/mod_request.html#keptbodysize @@ -359,6 +363,7 @@ maxrequestworkers mod/mpm_common.html#maxrequestworkers maxspareservers mod/prefork.html#maxspareservers maxsparethreads mod/mpm_common.html#maxsparethreads maxthreads mod/mpm_netware.html#maxthreads +mergetrailers mod/core.html#mergetrailers metadir mod/mod_cern_meta.html#metadir metafiles mod/mod_cern_meta.html#metafiles metasuffix mod/mod_cern_meta.html#metasuffix diff --git a/docs/manual/mod/allmodules.xml b/docs/manual/mod/allmodules.xml index 30f523624e0..53daf8a100e 100644 --- a/docs/manual/mod/allmodules.xml +++ b/docs/manual/mod/allmodules.xml @@ -61,6 +61,7 @@ mod_include.xml mod_info.xml mod_isapi.xml + mod_journald.xml mod_lbmethod_bybusyness.xml mod_lbmethod_byrequests.xml mod_lbmethod_bytraffic.xml diff --git a/docs/manual/mod/allmodules.xml.de b/docs/manual/mod/allmodules.xml.de index 064ccfaab43..b1313574b8f 100644 --- a/docs/manual/mod/allmodules.xml.de +++ b/docs/manual/mod/allmodules.xml.de @@ -61,6 +61,7 @@ mod_include.xml mod_info.xml mod_isapi.xml + mod_journald.xml mod_lbmethod_bybusyness.xml mod_lbmethod_byrequests.xml mod_lbmethod_bytraffic.xml diff --git a/docs/manual/mod/allmodules.xml.es b/docs/manual/mod/allmodules.xml.es index 7ba26e5dd32..8d488b68a44 100644 --- a/docs/manual/mod/allmodules.xml.es +++ b/docs/manual/mod/allmodules.xml.es @@ -61,6 +61,7 @@ mod_include.xml mod_info.xml mod_isapi.xml + mod_journald.xml mod_lbmethod_bybusyness.xml mod_lbmethod_byrequests.xml mod_lbmethod_bytraffic.xml diff --git a/docs/manual/mod/allmodules.xml.fr b/docs/manual/mod/allmodules.xml.fr index 2ecfcbafeb7..148a1be7acc 100644 --- a/docs/manual/mod/allmodules.xml.fr +++ b/docs/manual/mod/allmodules.xml.fr @@ -61,6 +61,7 @@ mod_include.xml mod_info.xml.fr mod_isapi.xml + mod_journald.xml mod_lbmethod_bybusyness.xml mod_lbmethod_byrequests.xml mod_lbmethod_bytraffic.xml diff --git a/docs/manual/mod/allmodules.xml.ja b/docs/manual/mod/allmodules.xml.ja index c32f114c837..3f93872ea78 100644 --- a/docs/manual/mod/allmodules.xml.ja +++ b/docs/manual/mod/allmodules.xml.ja @@ -61,6 +61,7 @@ mod_include.xml.ja mod_info.xml.ja mod_isapi.xml + mod_journald.xml mod_lbmethod_bybusyness.xml mod_lbmethod_byrequests.xml mod_lbmethod_bytraffic.xml diff --git a/docs/manual/mod/allmodules.xml.ko b/docs/manual/mod/allmodules.xml.ko index 47e1ee7e11c..8cf09ec2055 100644 --- a/docs/manual/mod/allmodules.xml.ko +++ b/docs/manual/mod/allmodules.xml.ko @@ -61,6 +61,7 @@ mod_include.xml mod_info.xml.ko mod_isapi.xml.ko + mod_journald.xml mod_lbmethod_bybusyness.xml mod_lbmethod_byrequests.xml mod_lbmethod_bytraffic.xml diff --git a/docs/manual/mod/allmodules.xml.tr b/docs/manual/mod/allmodules.xml.tr index 08d63d0fc87..d4efb65b314 100644 --- a/docs/manual/mod/allmodules.xml.tr +++ b/docs/manual/mod/allmodules.xml.tr @@ -61,6 +61,7 @@ mod_include.xml mod_info.xml mod_isapi.xml + mod_journald.xml mod_lbmethod_bybusyness.xml mod_lbmethod_byrequests.xml mod_lbmethod_bytraffic.xml diff --git a/docs/manual/mod/allmodules.xml.zh-cn b/docs/manual/mod/allmodules.xml.zh-cn index 30f523624e0..53daf8a100e 100644 --- a/docs/manual/mod/allmodules.xml.zh-cn +++ b/docs/manual/mod/allmodules.xml.zh-cn @@ -61,6 +61,7 @@ mod_include.xml mod_info.xml mod_isapi.xml + mod_journald.xml mod_lbmethod_bybusyness.xml mod_lbmethod_byrequests.xml mod_lbmethod_bytraffic.xml diff --git a/docs/manual/mod/core.html.de b/docs/manual/mod/core.html.de index 82ed4918d27..908a0e70a85 100644 --- a/docs/manual/mod/core.html.de +++ b/docs/manual/mod/core.html.de @@ -93,6 +93,7 @@ Servers
  • MaxRangeOverlaps
  • MaxRangeReversals
  • MaxRanges
    • +
  • MergeTrailers
  • Mutex
  • NameVirtualHost
  • Options
    • @@ -2454,6 +2455,19 @@ resource noch nicht übersetzt. Bitte schauen Sie in die englische Version.

    top
    +

    MergeTrailers-Direktive

    + + + + + + + + +
    Beschreibung:Determins whether trailers are merged into headers
    Syntax:MergeTrailers [on|off]
    Voreinstellung:MergeTrailers off
    Kontext:Serverkonfiguration, Virtual Host
    Status:Core
    Modul:core
    Kompatibilität:2.4.10 and later

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

    +
    top

    Mutex-Direktive

  • MaxRangeOverlaps
  • MaxRangeReversals
  • MaxRanges
    • +
  • MergeTrailers
  • Mutex
  • NameVirtualHost
  • Options
    • @@ -3106,6 +3107,25 @@ resource server is willing to satisfy. + +
    top
    +

    MergeTrailers Directive

    +
    Beschreibung:Configures mutex mechanism and lock file directory for all diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index 86c4a2dd987..f9beda9bc18 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -90,6 +90,7 @@ available
    + + + + + + + +
    Description:Determins whether trailers are merged into headers
    Syntax:MergeTrailers [on|off]
    Default:MergeTrailers off
    Context:server config, virtual host
    Status:Core
    Module:core
    Compatibility:2.4.10 and later
    +

    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 + processing would have a chance to examine or modify request headers.

    +

    This option is provided for compatibility with releases prior to 2.4.10, + where trailers were always merged.

    +
    top

    Mutex Directive

    diff --git a/docs/manual/mod/core.html.es b/docs/manual/mod/core.html.es index 8b70f36884c..9c4d14ef1e7 100644 --- a/docs/manual/mod/core.html.es +++ b/docs/manual/mod/core.html.es @@ -93,6 +93,7 @@
  • MaxRangeOverlaps
  • MaxRangeReversals
  • MaxRanges
    • +
  • MergeTrailers
  • Mutex
  • NameVirtualHost
  • Options
    • @@ -2852,6 +2853,19 @@ resource not been translated yet. Please have a look at the English version.

    top
    +

    MergeTrailers Directiva

    + + + + + + + + +
    Descripción:Determins whether trailers are merged into headers
    Sintaxis:MergeTrailers [on|off]
    Valor por defecto:MergeTrailers off
    Contexto:server config, virtual host
    Estado:Core
    Módulo:core
    Compatibilidad:2.4.10 and later

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

    +
    top

    Mutex Directiva

  • MaxRangeOverlaps
  • MaxRangeReversals
  • MaxRanges
    • +
  • MergeTrailers
  • Mutex
  • NameVirtualHost
  • Options
    • @@ -3320,6 +3323,19 @@ Apache
    top
    +

    MergeTrailers Directive

    +
    Descripción:Configures mutex mechanism and lock file directory for all diff --git a/docs/manual/mod/core.html.fr b/docs/manual/mod/core.html.fr index 80632e2f59e..1bf8754e6b7 100644 --- a/docs/manual/mod/core.html.fr +++ b/docs/manual/mod/core.html.fr @@ -31,6 +31,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
    @@ -90,6 +92,7 @@ disponibles
    + + + + + + + +
    Description:Determins whether trailers are merged into headers
    Syntaxe:MergeTrailers [on|off]
    Défaut:MergeTrailers off
    Contexte:configuration du serveur, serveur virtuel
    Statut:Core
    Module:core
    Compatibilité:2.4.10 and later

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

    +
    top

    Mutex Directive

    まだ翻訳されていません。英語版をご覧ください。

    top
    +

    MergeTrailers ディレクティブ

    +
    Description:Définit les mécanismes de mutex et le repertoire du fichier diff --git a/docs/manual/mod/core.html.ja.utf8 b/docs/manual/mod/core.html.ja.utf8 index ad81afbd296..9efa0f243ea 100644 --- a/docs/manual/mod/core.html.ja.utf8 +++ b/docs/manual/mod/core.html.ja.utf8 @@ -93,6 +93,7 @@
  • MaxRangeOverlaps
  • MaxRangeReversals
  • MaxRanges
    • +
  • MergeTrailers
  • Mutex
  • NameVirtualHost
  • Options
    • @@ -2395,6 +2396,19 @@ resource
    + + + + + + + +
    説明:Determins whether trailers are merged into headers
    構文:MergeTrailers [on|off]
    デフォルト:MergeTrailers off
    コンテキスト:サーバ設定ファイル, バーチャルホスト
    ステータス:Core
    モジュール:core
    互換性:2.4.10 and later

    このディレクティブの解説文書は + まだ翻訳されていません。英語版をご覧ください。 +

    +
    top

    Mutex ディレクティブ

    top
    +

    MergeTrailers Yönergesi

    +
    説明:Configures mutex mechanism and lock file directory for all diff --git a/docs/manual/mod/core.html.tr.utf8 b/docs/manual/mod/core.html.tr.utf8 index e1994937b1b..07ecb2efe24 100644 --- a/docs/manual/mod/core.html.tr.utf8 +++ b/docs/manual/mod/core.html.tr.utf8 @@ -91,6 +91,7 @@
  • MaxRangeOverlaps
  • MaxRangeReversals
  • MaxRanges
    • +
  • MergeTrailers
  • Mutex
  • NameVirtualHost
  • Options
    • @@ -3103,6 +3104,18 @@ uygulanır.
    + + + + + + + +
    Açıklama:Determins whether trailers are merged into headers
    Sözdizimi:MergeTrailers [on|off]
    Öntanımlı:MergeTrailers off
    Bağlam:sunucu geneli, sanal konak
    Durum:Çekirdek
    Modül:core
    Uyumluluk:2.4.10 and later

    Bu yönergenin belgesi henüz Türkçeye çevrilmedi. + Lütfen İngilizce sürümüne bakınız.

    +
    top

    Mutex Yönergesi

    diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de index 6a6435f4098..7fbc5a6f3b2 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 b20981b6f09..feb8184b036 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_deflate.xml.ja b/docs/manual/mod/mod_deflate.xml.ja index df2922c535b..6b9783ccd4b 100644 --- a/docs/manual/mod/mod_deflate.xml.ja +++ b/docs/manual/mod/mod_deflate.xml.ja @@ -1,7 +1,7 @@ - + + +mod_journald - Apache HTTP Server Version 2.5 + + + + + + + +
    +

    Modules | Directives | FAQ | Glossary | Sitemap

    +

    Apache HTTP Server Version 2.5

    +
    +
    <-
    + +
    +

    Apache Module mod_journald

    +
    +

    Available Languages:  en 

    +
    +
    Açıklama:Muteks mekanizmasını ve kilit dosyası dizinini tüm muteksler veya belirtilenler için yapılandırır
    + + +
    Description:Provides "journald" ErrorLog provider
    Status:Extension
    Module Identifier:journald_module
    Source File:mod_journald.c
    +

    Summary

    + +

    This module provides "journald" ErrorLog provider. It allows logging + error messages and CustomLog/TransferLog via systemd-journald(8).

    +
    +

    Directives

    + +

    Topics

    +
    +
    top
    +
    +

    Structured logging

    + +

    Systemd-journald allows structured logging and therefore it is + possible to filter logged messages according to various variables. + Currently supported variables are: +

    +
    +
    LOG
    +
    The name of the log. For ErrorLog, the value is "error_log". + For CustomLog or TransferLog, the value is the first argument of + these directives.
    +
    REQUEST_HOSTNAME
    +
    Host, as set by full URI or Host: header in the request.
    +
    REQUEST_USER
    +
    If an authentication check was made, this gets set to the user + name.
    +
    REQUEST_USERAGENT_IP
    +
    The address that originated the request.
    +
    REQUEST_URI
    +
    The path portion of the URI, or "/" if no path provided.
    +
    SERVER_HOSTNAME
    +
    The hostname of server for which the log message has been + generated.
    +
    + +

    These variables can be for example used to show only log messages + for particular URI using journalctl: +

    + + 
    journalctl REQUEST_URI=/index.html -a
    + + +

    For more examples, see systemd-journalctl documentation.

    +
    top
    +
    +

    Examples

    + + +

    Using journald in ErrorLog directive (see core) + instead of a filename enables logging via systemd-journald(8) + if the system supports it. +

    + + 
    ErrorLog journald
    + + +
    +
    top
    +

    JournaldCustomLog Directive

    + + + + + + + +
    Description:Enable logging of CustomLog/TransferLog to systemd-journald
    Syntax:JournaldCustomLog on|off
    Default:JournaldCustomLog off
    Context:server config
    Status:Extension
    Module:mod_journald
    + +

    The JournaldCustomLog directive enables logging + of CustomLog and TransferLog messages to systemd-journald. +

    + +

    Performance warning

    + Currently, systemd-journald is not designed for high-throughput logging + and logging access_log to systemd-journald could decrease the performance + a lot. +

    + +
    + +
    +

    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_journald.xml.meta b/docs/manual/mod/mod_journald.xml.meta new file mode 100644 index 00000000000..b5c437a9753 --- /dev/null +++ b/docs/manual/mod/mod_journald.xml.meta @@ -0,0 +1,12 @@ + + + + + mod_journald + /mod/ + .. + + + en + + diff --git a/docs/manual/mod/mod_log_config.html.en b/docs/manual/mod/mod_log_config.html.en index 480c4cc9553..d7f83a22af5 100644 --- a/docs/manual/mod/mod_log_config.html.en +++ b/docs/manual/mod/mod_log_config.html.en @@ -233,6 +233,12 @@ Bytes transferred (received and sent), including request and headers, cannot be zero. This is the combination of %I and %O. You need to enable mod_logio to use this. +%{VARNAME}^ti + The contents of VARNAME: trailer line(s) + in the request sent to the server. +%{VARNAME}^to + The contents of VARNAME: trailer line(s) + in the response sent from the server.

    Modifiers

    @@ -299,6 +305,14 @@ information when content caching is involved.

    +
    +

    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 + "%Dus".

    +
    +

    Examples

    diff --git a/docs/manual/mod/mod_log_config.xml.ja b/docs/manual/mod/mod_log_config.xml.ja index 6c6b2f4b048..fef7a4c24ee 100644 --- a/docs/manual/mod/mod_log_config.xml.ja +++ b/docs/manual/mod/mod_log_config.xml.ja @@ -1,7 +1,7 @@ - + + +