From 1b053f65a3af7c802c386a3d0e52e58c4b6734df Mon Sep 17 00:00:00 2001 From: Christophe Jaillet Date: Sat, 25 Dec 2021 09:14:26 +0000 Subject: [PATCH] Rebuild doc [skip ci] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1896380 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/directives.html.en | 4 +- docs/manual/mod/mod_tls.html.en | 110 +++++++++++++------------ docs/manual/mod/quickreference.html.en | 36 ++++---- 3 files changed, 78 insertions(+), 72 deletions(-) diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en index f78363ca887..a6c8d2524f3 100644 --- a/docs/manual/mod/directives.html.en +++ b/docs/manual/mod/directives.html.en @@ -733,8 +733,8 @@
  • TLSOptions
  • TLSProtocol
  • TLSProxyCA
    • -
  • TLSProxyCipherPrefer
    • -
  • TLSProxyCipherSuppress
    • +
  • TLSProxyCiphersPrefer
    • +
  • TLSProxyCiphersSuppress
  • TLSProxyEngine
  • TLSProxyMachineCertificate
  • TLSProxyProtocol
    • diff --git a/docs/manual/mod/mod_tls.html.en b/docs/manual/mod/mod_tls.html.en index 774c7251984..d510bfc7b96 100644 --- a/docs/manual/mod/mod_tls.html.en +++ b/docs/manual/mod/mod_tls.html.en @@ -55,15 +55,15 @@
    Support Apache!

    Topics

    Directives

    top
    -

    TLS in a VirtualHost context

    +

    TLS in a VirtualHost context

    Listen 443
 TLSEngine 443
@@ -110,7 +110,7 @@ TLSEngine 443
    top
    -

    Feature Comparison with mod_ssl

    +

    Feature Comparison with mod_ssl

    The table below gives a comparison of feature between mod_ssl and mod_tls. If a feature of mod_ssl is no listed here, @@ -128,7 +128,7 @@ TLSEngine 443 SNI Virtual Hostsyesyes Client Certificatesyesno Machine Certificates for Backendyesyes -OCSP Staplingyesyes**)via mod_md +OCSP Staplingyesyes**)via mod_md Backend OCSP checkyesno**)stapling will be verified TLS version to allowmin-maxmin TLS ciphersexclusive listpreferred/suppressed @@ -146,7 +146,7 @@ TLSEngine 443

    top
    -

    TLS Protocols

    +

    TLS Protocols

    mod_tls supports TLS protocol version 1.2 and 1.3. Should there ever be a version 1.4 and rustls supports it, it will be available as well. @@ -162,7 +162,7 @@ TLSEngine 443

    top
    -

    TLS Ciphers

    +

    TLS Ciphers

    The list of TLS ciphers supported in the rustls library, can be found here. All TLS v1.3 @@ -220,14 +220,15 @@ TLSCiphersPrefer ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305

    top
    -

    Virtual Hosts

    +

    Virtual Hosts

    mod_tls uses the SNI (Server Name Indicator) to select one of the configured virtual hosts that match the port being served. Should the client not provide an SNI, the first configured virtual host will be selected. If the client does provide an SNI (as all today's clients do), it must match one - virtual host (ServerName or ServerAlias) + virtual host (ServerName or + ServerAlias) or the connection will fail.

    @@ -258,7 +259,7 @@ TLSEngine 443

    top
    -

    ACME Certificates

    +

    ACME Certificates

    ACME certificates via mod_md are supported, just as for mod_ssl. A minimal configuration: @@ -274,7 +275,7 @@ MDomain example.net

    top
    -

    OCSP Stapling

    +

    OCSP Stapling

    mod_tls has no own implementation to retrieve OCSP information for a certificate. However, it will use such for Stapling if it is provided @@ -283,15 +284,15 @@ MDomain example.net

    top
    -

    TLS Variables

    +

    TLS Variables

    - Via the directive TLSOptions, several variables + Via the directive TLSOptions, several variables are placed into the environment of requests and can be inspected, for example in a CGI script.

    The variable names are given by mod_ssl. Note that these - are only a subset of the many variables that mod_ssl exposes. + are only a subset of the many variables that mod_ssl exposes.

    @@ -313,7 +314,7 @@ MDomain example.net

    top
    -

    Client Certificates

    +

    Client Certificates

    While rustls supports client certificates in principle, parts of the infrastructure to make use of these in a server are not @@ -334,7 +335,7 @@ MDomain example.net

    TLSCertificate Directive

    VariableTLSOptionDescription
    - + @@ -352,7 +353,7 @@ MDomain example.net

    TLSCiphersPrefer Directive

    Description:adds a certificate and key (PEM encoded) to a server/virtual host.
    Syntax:TLSCertificate cert_file [key_file]
    Syntax:TLSCertificate cert_file [key_file]
    Context:server config, virtual host
    Status:Experimental
    Module:mod_tls
    - + @@ -376,7 +377,7 @@ MDomain example.net

    TLSCiphersSuppress Directive

    Description:defines ciphers that are preferred.
    Syntax:TLSCiphersPrefer cipher(-list)
    Syntax:TLSCiphersPrefer cipher(-list)
    Context:server config, virtual host
    Status:Experimental
    Module:mod_tls
    - + @@ -399,15 +400,16 @@ MDomain example.net

    TLSEngine Directive

    Description:defines ciphers that are not to be used.
    Syntax:TLSCiphersSuppress cipher(-list)
    Syntax:TLSCiphersSuppress cipher(-list)
    Context:server config, virtual host
    Status:Experimental
    Module:mod_tls
    - +
    Description:defines on which address+port the module shall handle incoming connections.
    Syntax:TLSEngine [address:]port
    Syntax:TLSEngine [address:]port
    Context:server config
    Status:Experimental
    Module:mod_tls

    - This is set on a global level, not in individual `VirtualHost`s. - It will affect all `VirtualHost` that match the specified address/port. - You can use `TLSEngine` several times to use more than one address/port. + This is set on a global level, not in individual <VirtualHost>s. + It will affect all <VirtualHost> + that match the specified address/port. + You can use TLSEngine several times to use more than one address/port.

    Example

    TLSEngine 443
    @@ -421,15 +423,16 @@ MDomain example.net
    top

    TLSHonorClientOrder Directive

    - + +
    Description:
    Description:determines if the order of ciphers supported by the client is honored
    Syntax:TLSHonorClientOrder on|off
    Default:TLSHonorClientOrder on
    Context:server config, virtual host
    Status:Experimental
    Module:mod_tls

    - TLSHonorClientOrder determines if the order of ciphers - supported by the client is honored. This is `on` by default. + TLSHonorClientOrder determines if the order of ciphers + supported by the client is honored.

    @@ -438,13 +441,13 @@ MDomain example.net

    TLSOptions Directive

    - +
    Description:enables SSL variables for requests.
    Syntax:TLSOptions [+|-]option
    Syntax:TLSOptions [+|-]option
    Context:server config, virtual host, directory, .htaccess
    Status:Experimental
    Module:mod_tls

    - TLSOptions is analog to `SSLOptions` in mod_ssl. + TLSOptions is analog to SSLOptions in mod_ssl. It can be set per directory/location and `option` can be: