From e0d80d75bf6efcf858f0d018040f376b5191487c Mon Sep 17 00:00:00 2001 From: Mike Rumph Date: Thu, 13 Aug 2015 19:41:36 +0000 Subject: [PATCH] Generated doc changes git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1695765 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/core.html.en | 72 ++++++++ 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/directives.html.en | 2 + docs/manual/mod/mod_proxy.html.en | 228 +++++++++++++------------ docs/manual/mod/mod_proxy.xml.fr | 2 +- docs/manual/mod/mod_proxy.xml.ja | 2 +- docs/manual/mod/mod_proxy.xml.meta | 2 +- docs/manual/mod/quickreference.html.en | 2 + 13 files changed, 200 insertions(+), 122 deletions(-) diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index 5ba53e4e74..5583083dc5 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -98,6 +98,8 @@ available
  • NameVirtualHost
  • Options
  • Protocol
  • +
  • Protocols
  • +
  • ProtocolsHonorOrder
  • RegisterHttpMethod
  • RLimitCPU
  • RLimitMEM
  • @@ -3665,6 +3667,76 @@ directory
    top
    +

    Protocols Directive

    + + + + + + + +
    Description:Protocols available for a server/virtual host
    Syntax:Protocols protocol ...
    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 only need to set protocols if you want to limit the available + protocols for a server/host. By default, all supported protocols + are available to a client.

    + +

    For example, if you want to support only HTTP/1.1 for a server, even + though HTTP/2 is available, just specify this protocol only:

    + +
    Protocols 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 and virtual hosts are concatenated + by appending the base ones, if there are configured protocols, + to the virtual host ones. Since protocols such as HTTP/2 allow + connection reuse under certain conditions, restricting protocols for + individual virtual hosts might not work as you expect it to.

    + + +

    See also

    + +
    +
    top
    +

    ProtocolsHonorOrder Directive

    + + + + + + + + +
    Description:Protocols available for a server/virtual host
    Syntax:ProtocolsHonorOrder On|Off
    Default:ProtocolsHonorOrder Off
    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.

    + +

    By default, a client supplies a list of supported protocols and the server + selects an available one from that list in the given order.

    + +

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

    + + +

    See also

    + +
    +
    top

    RegisterHttpMethod Directive

    diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de index ea55832ac3..38fceb3251 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 be5f909f2a..397b85207c 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_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja index 2cdf542495..6883201d8f 100644 --- a/docs/manual/mod/mod_proxy.xml.ja +++ b/docs/manual/mod/mod_proxy.xml.ja @@ -1,7 +1,7 @@ - +
    Description:Register non-standard HTTP methods