From: Daniel Ruggeri
Date: Mon, 19 Feb 2018 14:18:51 +0000 (+0000)
Subject: Post 2.4.30 tag updates
X-Git-Tag: 2.4.31~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c7e0f28f9e631c8f162cfa96a8a8463b1ebe00f;p=apache
Post 2.4.30 tag updates
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824751 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/CHANGES b/CHANGES
index 33ffd97dd4..cf65d5bff6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,6 @@
-*- coding: utf-8 -*-
+Changes with Apache 2.4.30
+
Changes with Apache 2.4.30
*) mod_proxy: Provide an RFC1035 compliant version of the hostname in the
diff --git a/STATUS b/STATUS
index de2cfe3a51..db0b297478 100644
--- a/STATUS
+++ b/STATUS
@@ -29,7 +29,7 @@ Release history:
[NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,
while x.{even}.z versions are Stable/GA releases.]
- 2.4.30 : In development. Jim proposes a T&R Feb. 19, 2018.
+-8s 2.4.30 : In development. Jim proposes a T&R Feb. 19, 2018.
2.4.29 : Tagged on October 17, 2017. Released on October 23, 2017.
2.4.28 : Tagged on September 25, 2017. Released on October 5, 2017.
2.4.27 : Tagged on July 6, 2017. Released on July 11, 2017.
diff --git a/docs/manual/convenience.map b/docs/manual/convenience.map
index d854a7dc3a..dce68daaea 100644
--- a/docs/manual/convenience.map
+++ b/docs/manual/convenience.map
@@ -370,6 +370,24 @@ maxrequestworkers mod/mpm_common.html#maxrequestworkers
maxspareservers mod/prefork.html#maxspareservers
maxsparethreads mod/mpm_common.html#maxsparethreads
maxthreads mod/mpm_netware.html#maxthreads
+mdbaseserver mod/mod_md.html#mdbaseserver
+mdcachallenges mod/mod_md.html#mdcachallenges
+mdcertificateagreement mod/mod_md.html#mdcertificateagreement
+mdcertificateauthority mod/mod_md.html#mdcertificateauthority
+mdcertificateprotocol mod/mod_md.html#mdcertificateprotocol
+mddrivemode mod/mod_md.html#mddrivemode
+mdhttpproxy mod/mod_md.html#mdhttpproxy
+mdmember mod/mod_md.html#mdmember
+mdmembers mod/mod_md.html#mdmembers
+mdmuststaple mod/mod_md.html#mdmuststaple
+mdnotifycmd mod/mod_md.html#mdnotifycmd
+mdomain mod/mod_md.html#mdomain
+mdomainset mod/mod_md.html#mdomainset
+mdportmap mod/mod_md.html#mdportmap
+mdprivatekeys mod/mod_md.html#mdprivatekeys
+mdrenewwindow mod/mod_md.html#mdrenewwindow
+mdrequirehttps mod/mod_md.html#mdrequirehttps
+mdstoredir mod/mod_md.html#mdstoredir
memcacheconnttl mod/mod_socache_memcache.html#memcacheconnttl
mergetrailers mod/core.html#mergetrailers
metadir mod/mod_cern_meta.html#metadir
@@ -461,6 +479,8 @@ remoteipheader mod/mod_remoteip.html#remoteipheader
remoteipinternalproxy mod/mod_remoteip.html#remoteipinternalproxy
remoteipinternalproxylist mod/mod_remoteip.html#remoteipinternalproxylist
remoteipproxiesheader mod/mod_remoteip.html#remoteipproxiesheader
+remoteipproxyprotocol mod/mod_remoteip.html#remoteipproxyprotocol
+remoteipproxyprotocolexceptions mod/mod_remoteip.html#remoteipproxyprotocolexceptions
remoteiptrustedproxy mod/mod_remoteip.html#remoteiptrustedproxy
remoteiptrustedproxylist mod/mod_remoteip.html#remoteiptrustedproxylist
removecharset mod/mod_mime.html#removecharset
diff --git a/docs/manual/mod/directives.html.de b/docs/manual/mod/directives.html.de
index 693b9beb7f..2e619aba72 100644
--- a/docs/manual/mod/directives.html.de
+++ b/docs/manual/mod/directives.html.de
@@ -521,6 +521,8 @@
RemoteIPInternalProxy
RemoteIPInternalProxyList
RemoteIPProxiesHeader
+RemoteIPProxyProtocol
+RemoteIPProxyProtocolExceptions
RemoteIPTrustedProxy
RemoteIPTrustedProxyList
RemoveCharset
diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en
index c421f3d4e4..7bf3078f11 100644
--- a/docs/manual/mod/directives.html.en
+++ b/docs/manual/mod/directives.html.en
@@ -522,6 +522,8 @@
RemoteIPInternalProxy
RemoteIPInternalProxyList
RemoteIPProxiesHeader
+RemoteIPProxyProtocol
+RemoteIPProxyProtocolExceptions
RemoteIPTrustedProxy
RemoteIPTrustedProxyList
RemoveCharset
diff --git a/docs/manual/mod/directives.html.es b/docs/manual/mod/directives.html.es
index 07a1213de9..62de0fd457 100644
--- a/docs/manual/mod/directives.html.es
+++ b/docs/manual/mod/directives.html.es
@@ -524,6 +524,8 @@
RemoteIPInternalProxy
RemoteIPInternalProxyList
RemoteIPProxiesHeader
+RemoteIPProxyProtocol
+RemoteIPProxyProtocolExceptions
RemoteIPTrustedProxy
RemoteIPTrustedProxyList
RemoveCharset
diff --git a/docs/manual/mod/directives.html.ja.utf8 b/docs/manual/mod/directives.html.ja.utf8
index 05d50f8164..6a6ef51a1e 100644
--- a/docs/manual/mod/directives.html.ja.utf8
+++ b/docs/manual/mod/directives.html.ja.utf8
@@ -519,6 +519,8 @@
RemoteIPInternalProxy
RemoteIPInternalProxyList
RemoteIPProxiesHeader
+RemoteIPProxyProtocol
+RemoteIPProxyProtocolExceptions
RemoteIPTrustedProxy
RemoteIPTrustedProxyList
RemoveCharset
diff --git a/docs/manual/mod/directives.html.ko.euc-kr b/docs/manual/mod/directives.html.ko.euc-kr
index 31417e3c42..1250bf929e 100644
--- a/docs/manual/mod/directives.html.ko.euc-kr
+++ b/docs/manual/mod/directives.html.ko.euc-kr
@@ -519,6 +519,8 @@
RemoteIPInternalProxy
RemoteIPInternalProxyList
RemoteIPProxiesHeader
+RemoteIPProxyProtocol
+RemoteIPProxyProtocolExceptions
RemoteIPTrustedProxy
RemoteIPTrustedProxyList
RemoveCharset
diff --git a/docs/manual/mod/directives.html.tr.utf8 b/docs/manual/mod/directives.html.tr.utf8
index 7b4768d49f..abe04bac67 100644
--- a/docs/manual/mod/directives.html.tr.utf8
+++ b/docs/manual/mod/directives.html.tr.utf8
@@ -518,6 +518,8 @@
RemoteIPInternalProxy
RemoteIPInternalProxyList
RemoteIPProxiesHeader
+RemoteIPProxyProtocol
+RemoteIPProxyProtocolExceptions
RemoteIPTrustedProxy
RemoteIPTrustedProxyList
RemoveCharset
diff --git a/docs/manual/mod/directives.html.zh-cn.utf8 b/docs/manual/mod/directives.html.zh-cn.utf8
index 63a6ee79a4..06f86fd5cb 100644
--- a/docs/manual/mod/directives.html.zh-cn.utf8
+++ b/docs/manual/mod/directives.html.zh-cn.utf8
@@ -517,6 +517,8 @@
RemoteIPInternalProxy
RemoteIPInternalProxyList
RemoteIPProxiesHeader
+RemoteIPProxyProtocol
+RemoteIPProxyProtocolExceptions
RemoteIPTrustedProxy
RemoteIPTrustedProxyList
RemoveCharset
diff --git a/docs/manual/mod/index.html.de b/docs/manual/mod/index.html.de
index 4e4997725c..a12a4b3639 100644
--- a/docs/manual/mod/index.html.de
+++ b/docs/manual/mod/index.html.de
@@ -205,6 +205,7 @@ from Clients' networks in a proxy context.
mod_proxy_http2HTTP/2 support module for
mod_proxy
mod_proxy_scgiSCGI gateway module for mod_proxy
+mod_proxy_uwsgiUWSGI gateway module for mod_proxy
mod_proxy_wstunnelWebsockets support module for
mod_proxy
mod_ratelimitBandwidth Rate Limiting for Clients
diff --git a/docs/manual/mod/index.html.en b/docs/manual/mod/index.html.en
index 08afdd88c5..ce2b717584 100644
--- a/docs/manual/mod/index.html.en
+++ b/docs/manual/mod/index.html.en
@@ -201,6 +201,7 @@ from Clients' networks in a proxy context.
mod_proxy_http2HTTP/2 support module for
mod_proxy
mod_proxy_scgiSCGI gateway module for mod_proxy
+mod_proxy_uwsgiUWSGI gateway module for mod_proxy
mod_proxy_wstunnelWebsockets support module for
mod_proxy
mod_ratelimitBandwidth Rate Limiting for Clients
diff --git a/docs/manual/mod/index.html.es b/docs/manual/mod/index.html.es
index aa3d8fdf06..13531a3cc3 100644
--- a/docs/manual/mod/index.html.es
+++ b/docs/manual/mod/index.html.es
@@ -206,6 +206,7 @@ from Clients' networks in a proxy context.
mod_proxy_http2HTTP/2 support module for
mod_proxy
mod_proxy_scgiSCGI gateway module for mod_proxy
+mod_proxy_uwsgiUWSGI gateway module for mod_proxy
mod_proxy_wstunnelWebsockets support module for
mod_proxy
mod_ratelimitBandwidth Rate Limiting for Clients
diff --git a/docs/manual/mod/index.html.ja.utf8 b/docs/manual/mod/index.html.ja.utf8
index 8bcb4d5c4f..ec87c617c7 100644
--- a/docs/manual/mod/index.html.ja.utf8
+++ b/docs/manual/mod/index.html.ja.utf8
@@ -193,6 +193,7 @@ from Clients' networks in a proxy context.
mod_proxy_http2HTTP/2 support module for
mod_proxy
mod_proxy_scgiSCGI gateway module for mod_proxy
+mod_proxy_uwsgiUWSGI gateway module for mod_proxy
mod_proxy_wstunnelWebsockets support module for
mod_proxy
mod_ratelimitBandwidth Rate Limiting for Clients
diff --git a/docs/manual/mod/index.html.ko.euc-kr b/docs/manual/mod/index.html.ko.euc-kr
index 040703af34..852a8c015f 100644
--- a/docs/manual/mod/index.html.ko.euc-kr
+++ b/docs/manual/mod/index.html.ko.euc-kr
@@ -191,6 +191,7 @@ from Clients' networks in a proxy context.
mod_proxy_http2HTTP/2 support module for
mod_proxy
mod_proxy_scgiSCGI gateway module for mod_proxy
+mod_proxy_uwsgiUWSGI gateway module for mod_proxy
mod_proxy_wstunnelWebsockets support module for
mod_proxy
mod_ratelimitBandwidth Rate Limiting for Clients
diff --git a/docs/manual/mod/index.html.tr.utf8 b/docs/manual/mod/index.html.tr.utf8
index 6313343ebc..6289d9f321 100644
--- a/docs/manual/mod/index.html.tr.utf8
+++ b/docs/manual/mod/index.html.tr.utf8
@@ -197,6 +197,7 @@ from Clients' networks in a proxy context.
mod_proxy_http2HTTP/2 support module for
mod_proxy
mod_proxy_scgiSCGI gateway module for mod_proxy
+mod_proxy_uwsgiUWSGI gateway module for mod_proxy
mod_proxy_wstunnelWebsockets support module for
mod_proxy
mod_ratelimitBandwidth Rate Limiting for Clients
diff --git a/docs/manual/mod/index.html.zh-cn.utf8 b/docs/manual/mod/index.html.zh-cn.utf8
index 2a20b708eb..860a905927 100644
--- a/docs/manual/mod/index.html.zh-cn.utf8
+++ b/docs/manual/mod/index.html.zh-cn.utf8
@@ -196,6 +196,7 @@ from Clients' networks in a proxy context.
mod_proxy_http2HTTP/2 support module for
mod_proxy
mod_proxy_scgiSCGI gateway module for mod_proxy
+mod_proxy_uwsgiUWSGI gateway module for mod_proxy
mod_proxy_wstunnelWebsockets support module for
mod_proxy
mod_ratelimitBandwidth Rate Limiting for Clients
diff --git a/docs/manual/mod/mod_remoteip.html.en b/docs/manual/mod/mod_remoteip.html.en
index cd829fc56c..ceaeb21ba2 100644
--- a/docs/manual/mod/mod_remoteip.html.en
+++ b/docs/manual/mod/mod_remoteip.html.en
@@ -47,6 +47,12 @@ via the request headers.
with the useragent IP address reported in the request header configured
with the RemoteIPHeader
directive.
+ Additionally, this module implements the server side of
+ HAProxy's
+ PROXY Protocol when
+ using the RemoteIPProxyProtocol
+ directive.
+
Once replaced as instructed, this overridden useragent IP address is
then used for the mod_authz_host
Require ip
@@ -69,6 +75,8 @@ via the request headers.
RemoteIPInternalProxy
RemoteIPInternalProxyList
RemoteIPProxiesHeader
+ RemoteIPProxyProtocol
+ RemoteIPProxyProtocolExceptions
RemoteIPTrustedProxy
RemoteIPTrustedProxyList
@@ -77,6 +85,7 @@ via the request headers.
mod_authz_host
mod_status
mod_log_config
+Proxy Protocol Spec
Comments
@@ -214,6 +223,77 @@ gateway.localdomain #The front end balancer
RemoteIPProxiesHeader X-Forwarded-By
+
+
+
+
+
The RemoteIPProxyProtocol
directive enables or
+ disables the reading and handling of the PROXY protocol connection header.
+ If enabled with the On
flag, the upstream client must
+ send the header every time it opens a connection or the connection will
+ be aborted unless it is in the list of disabled hosts provided by the
+ RemoteIPProxyProtocolExceptions
+ directive.
+
+
While this directive may be specified in any virtual host, it is
+ important to understand that because the PROXY protocol is connection
+ based and protocol agnostic, the enabling and disabling is actually based
+ on IP address and port. This means that if you have multiple name-based
+ virtual hosts for the same host and port, and you enable it for any one of
+ them, then it is enabled for all of them (with that host and port). It also
+ means that if you attempt to enable the PROXY protocol in one and disable
+ in the other, that won't work; in such a case, the last one wins and a
+ notice will be logged indicating which setting was being overridden.
+
+
Listen 80
+<VirtualHost *:80>
+ ServerName www.example.com
+ RemoteIPProxyProtocol On
+
+ #Requests to this virtual host must have a PROXY protocol
+ # header provided. If it is missing, the connection will
+ # be aborted
+</VirtualHost>
+
+Listen 8080
+<VirtualHost *:8080>
+ ServerName www.example.com
+ RemoteIPProxyProtocol On
+ RemoteIPProxyProtocolExceptions 127.0.0.1 10.0.0.0/8
+
+ #Requests to this virtual host must have a PROXY protocol
+ # header provided. If it is missing, the connection will
+ # be aborted except when coming from localhost or the
+ # 10.x.x.x RFC1918 range
+</VirtualHost>
+
+
+
+
+
+
+Description: | Disable processing of PROXY header for certain hosts or networks |
+Syntax: | RemoteIPProxyProtocolExceptions host|range [host|range] [host|range] |
+Context: | server config, virtual host |
+Status: | Base |
+Module: | mod_remoteip |
+Compatibility: | RemoteIPProxyProtocolExceptions is only available in httpd 2.4.28 and newer |
+
+
The RemoteIPProxyProtocol
directive enables or
+ disables the reading and handling of the PROXY protocol connection header.
+ Sometimes it is desirable to require clients to provide the PROXY header, but
+ permit other clients to connect without it. This directive allows a server
+ administrator to configure a single host or CIDR range of hosts that may do
+ so. This is generally useful for monitoring and administrative traffic to a
+ virtual host direct to the server behind the upstream load balancer.
+
diff --git a/docs/manual/mod/mod_ssl.html.en b/docs/manual/mod/mod_ssl.html.en
index 730dc3a9a0..2fa37d4a7b 100644
--- a/docs/manual/mod/mod_ssl.html.en
+++ b/docs/manual/mod/mod_ssl.html.en
@@ -1504,7 +1504,8 @@ The available (case-insensitive)
protocols are:
Description: | File of concatenated PEM-encoded CA Certificates
for Remote Server Auth |
Syntax: | SSLProxyCACertificateFile file-path |
---|
-
Context: | server config, virtual host |
---|
+
Context: | server config, virtual host, proxy section |
---|
+
Override: | Not applicable |
Status: | Extension |
Module: | mod_ssl |
---|
@@ -1525,7 +1526,8 @@ preference. This can be used alternatively and/or additionally to
Description: | Directory of PEM-encoded CA Certificates for
Remote Server Auth |
Syntax: | SSLProxyCACertificatePath directory-path |
---|
-
Context: | server config, virtual host |
---|
+
Context: | server config, virtual host, proxy section |
---|
+
Override: | Not applicable |
Status: | Extension |
Module: | mod_ssl |
---|
@@ -1549,7 +1551,8 @@ contains the appropriate symbolic links.
Description: | Enable CRL-based revocation checking for Remote Server Auth |
Syntax: | SSLProxyCARevocationCheck chain|leaf|none |
Default: | SSLProxyCARevocationCheck none |
---|
-
Context: | server config, virtual host |
---|
+
Context: | server config, virtual host, proxy section |
---|
+
Override: | Not applicable |
Status: | Extension |
Module: | mod_ssl |
---|
@@ -1586,7 +1589,8 @@ to succeed - otherwise it will fail with an
Description: | File of concatenated PEM-encoded CA CRLs for
Remote Server Auth |
Syntax: | SSLProxyCARevocationFile file-path |
---|
-
Context: | server config, virtual host |
---|
+
Context: | server config, virtual host, proxy section |
---|
+
Override: | Not applicable |
Status: | Extension |
Module: | mod_ssl |
---|
@@ -1607,7 +1611,8 @@ used alternatively and/or additionally to
Description:Directory of PEM-encoded CA CRLs for
Remote Server Auth |
Syntax: | SSLProxyCARevocationPath directory-path |
-Context: | server config, virtual host |
+Context: | server config, virtual host, proxy section |
+Override: | Not applicable |
Status: | Extension |
Module: | mod_ssl |
@@ -1632,7 +1637,8 @@ contains the appropriate symbolic links.
Syntax: | SSLProxyCheckPeerCN on|off |
Default: | SSLProxyCheckPeerCN on |
-Context: | server config, virtual host |
+Context: | server config, virtual host, proxy section |
+Override: | Not applicable |
Status: | Extension |
Module: | mod_ssl |
@@ -1673,7 +1679,8 @@ SSLProxyCheckPeerName off
Syntax: | SSLProxyCheckPeerExpire on|off |
Default: | SSLProxyCheckPeerExpire on |
-Context: | server config, virtual host |
+Context: | server config, virtual host, proxy section |
+Override: | Not applicable |
Status: | Extension |
Module: | mod_ssl |
@@ -1693,7 +1700,8 @@ sent.
Syntax: | SSLProxyCheckPeerName on|off |
Default: | SSLProxyCheckPeerName on |
-Context: | server config, virtual host |
+Context: | server config, virtual host, proxy section |
+Override: | Not applicable |
Status: | Extension |
Module: | mod_ssl |
Compatibility: | Apache HTTP Server 2.4.5 and later |
@@ -1733,8 +1741,8 @@ improvements.
proxy handshake
Syntax: | SSLProxyCipherSuite cipher-spec |
Default: | SSLProxyCipherSuite ALL:!ADH:RC4+RSA:+HIGH:+MEDIUM:+LOW:+EXP |
-Context: | server config, virtual host, directory, .htaccess |
-Override: | AuthConfig |
+Context: | server config, virtual host, proxy section |
+Override: | Not applicable |
Status: | Extension |
Module: | mod_ssl |
@@ -1750,7 +1758,8 @@ for additional information.
Description: | SSL Proxy Engine Operation Switch |
Syntax: | SSLProxyEngine on|off |
Default: | SSLProxyEngine off |
-Context: | server config, virtual host |
+Context: | server config, virtual host, proxy section |
+Override: | Not applicable |
Status: | Extension |
Module: | mod_ssl |
@@ -1779,7 +1788,7 @@ server to proxy SSL/TLS requests.
Description: | File of concatenated PEM-encoded CA certificates to be used by the proxy for choosing a certificate |
Syntax: | SSLProxyMachineCertificateChainFile filename |
-Context: | server config |
+Context: | server config, virtual host, proxy section |
Status: | Extension |
Module: | mod_ssl |
@@ -1808,7 +1817,7 @@ SSLProxyCACertificateFile
.
Description: | File of concatenated PEM-encoded client certificates and keys to be used by the proxy |
Syntax: | SSLProxyMachineCertificateFile filename |
-Context: | server config |
+Context: | server config, virtual host, proxy section |
Status: | Extension |
Module: | mod_ssl |
@@ -1833,7 +1842,7 @@ or additionally to
SSLProxyMachineCertificatePath
.
@@ -1858,8 +1867,8 @@ directory contains the appropriate symbolic links.
Description: | Configure usable SSL protocol flavors for proxy usage |
Syntax: | SSLProxyProtocol [+|-]protocol ... |
Default: | SSLProxyProtocol all -SSLv3 (up to 2.4.16: all) |
---|
-
Context: | server config, virtual host |
---|
-
Override: | Options |
---|
+
Context: | server config, virtual host, proxy section |
---|
+
Override: | Not applicable |
Status: | Extension |
Module: | mod_ssl |
---|
@@ -1879,7 +1888,8 @@ for additional information.
Description: | Type of remote server Certificate verification |
Syntax: | SSLProxyVerify level |
Default: | SSLProxyVerify none |
---|
-
Context: | server config, virtual host |
---|
+
Context: | server config, virtual host, proxy section |
---|
+
Override: | Not applicable |
Status: | Extension |
Module: | mod_ssl |
---|
@@ -1916,7 +1926,8 @@ authentication (but can be used to establish SSL test pages, etc.)
Certificate verification
Syntax: | SSLProxyVerifyDepth number |
Default: | SSLProxyVerifyDepth 1 |
---|
-
Context: | server config, virtual host |
---|
+
Context: | server config, virtual host, proxy section |
---|
+
Override: | Not applicable |
Status: | Extension |
Module: | mod_ssl |
---|
diff --git a/docs/manual/mod/overrides.html.en b/docs/manual/mod/overrides.html.en
index 20b84da9b9..ee5389e5ff 100644
--- a/docs/manual/mod/overrides.html.en
+++ b/docs/manual/mod/overrides.html.en
@@ -351,23 +351,20 @@ user authentication
SSLCipherSuite | mod_ssl |
Cipher Suite available for negotiation in SSL
handshake |
-
SSLProxyCipherSuite | mod_ssl |
-
Cipher Suite available for negotiation in SSL
-proxy handshake |
-
SSLRenegBufferSize | mod_ssl |
-
Set the size for the SSL renegotiation buffer |
-
SSLRequire | mod_ssl |
-
Allow access only when an arbitrarily complex
+ |
SSLRenegBufferSize | mod_ssl |
+
Set the size for the SSL renegotiation buffer |
+
SSLRequire | mod_ssl |
+
Allow access only when an arbitrarily complex
boolean expression is true |
-
SSLRequireSSL | mod_ssl |
-
Deny access when SSL is not used for the
+ |
SSLRequireSSL | mod_ssl |
+
Deny access when SSL is not used for the
HTTP request |
-
SSLUserName | mod_ssl |
-
Variable name to determine user name |
-
SSLVerifyClient | mod_ssl |
-
Type of Client Certificate verification |
-
SSLVerifyDepth | mod_ssl |
-
Maximum depth of CA Certificates in Client
+ |
SSLUserName | mod_ssl |
+
Variable name to determine user name |
+
SSLVerifyClient | mod_ssl |
+
Type of Client Certificate verification |
+
SSLVerifyDepth | mod_ssl |
+
Maximum depth of CA Certificates in Client
Certificate verification |
@@ -672,6 +669,48 @@ except the named ones
Controls the default access state and the order in which
Allow and Deny are
evaluated. |
+
+
+ [This section has no description. It's possible that the documentation is
+ incomplete, or that the directives here have an incorrect or misspelled
+ Override type. Please consider reporting this in the
+ comments section.]
+
+
The following directives are allowed in .htaccess files when
@@ -702,10 +741,8 @@ directory
Reflect an input header to the output headers |
SSLOptions | mod_ssl |
Configure various SSL engine run-time options |
-
SSLProxyProtocol | mod_ssl |
-
Configure usable SSL protocol flavors for proxy usage |
-
XBitHack | mod_include |
-
Parse SSI directives in files with the execute bit
+ |
XBitHack | mod_include |
+
Parse SSI directives in files with the execute bit
set |
Available Languages: en
diff --git a/docs/manual/mod/quickreference.html.de b/docs/manual/mod/quickreference.html.de
index 1e0b906efe..f0d9dc30aa 100644
--- a/docs/manual/mod/quickreference.html.de
+++ b/docs/manual/mod/quickreference.html.de
@@ -56,6 +56,7 @@
v | Virtual Host |
d | Verzeichnis |
h | .htaccess |
---|
+
| |
|
|
|
|
|
|
C | æ ¸å¿ |
M | MPM |
@@ -826,6 +827,8 @@ a different URL
RemoteIPInternalProxy proxy-ip|proxy-ip/subnet|hostname ... | | sv | B | Declare client intranet IP addresses trusted to present the RemoteIPHeader value |
RemoteIPInternalProxyList filename | | sv | B | Declare client intranet IP addresses trusted to present the RemoteIPHeader value |
RemoteIPProxiesHeader HeaderFieldName | | sv | B | Declare the header field which will record all intermediate IP addresses |
+RemoteIPProxyProtocol On|Off | | sv | B | Enable or disable PROXY protocol handling |
+RemoteIPProxyProtocolExceptions host|range [host|range] [host|range] | | sv | B | Disable processing of PROXY header for certain hosts or networks |
RemoteIPTrustedProxy proxy-ip|proxy-ip/subnet|hostname ... | | sv | B | Declare client intranet IP addresses trusted to present the RemoteIPHeader value |
RemoteIPTrustedProxyList filename | | sv | B | Declare client intranet IP addresses trusted to present the RemoteIPHeader value |
RemoveCharset extension [extension]
@@ -1028,12 +1031,12 @@ Remote Server Auth |
SSLProxyCheckPeerName on|off | on | sv | E | Configure host name checking for remote server certificates
|
-SSLProxyCipherSuite cipher-spec | ALL:!ADH:RC4+RSA:+H + | svdh | E | Cipher Suite available for negotiation in SSL
+ | SSLProxyCipherSuite cipher-spec | ALL:!ADH:RC4+RSA:+H + | sv | E | Cipher Suite available for negotiation in SSL
proxy handshake |
SSLProxyEngine on|off | off | sv | E | SSL Proxy Engine Operation Switch |
-SSLProxyMachineCertificateChainFile filename | | s | E | File of concatenated PEM-encoded CA certificates to be used by the proxy for choosing a certificate |
-SSLProxyMachineCertificateFile filename | | s | E | File of concatenated PEM-encoded client certificates and keys to be used by the proxy |
-SSLProxyMachineCertificatePath directory | | s | E | Directory of PEM-encoded client certificates and keys to be used by the proxy |
+SSLProxyMachineCertificateChainFile filename | | sv | E | File of concatenated PEM-encoded CA certificates to be used by the proxy for choosing a certificate |
+SSLProxyMachineCertificateFile filename | | sv | E | File of concatenated PEM-encoded client certificates and keys to be used by the proxy |
+SSLProxyMachineCertificatePath directory | | sv | E | Directory of PEM-encoded client certificates and keys to be used by the proxy |
SSLProxyProtocol [+|-]protocol ... | all -SSLv3 (up to 2 + | sv | E | Configure usable SSL protocol flavors for proxy usage |
SSLProxyVerify level | none | sv | E | Type of remote server Certificate verification |
SSLProxyVerifyDepth number | 1 | sv | E | Maximum depth of CA Certificates in Remote Server
diff --git a/docs/manual/sections.html.tr.utf8 b/docs/manual/sections.html.tr.utf8
index b18be77b1c..862bf9f9c8 100644
--- a/docs/manual/sections.html.tr.utf8
+++ b/docs/manual/sections.html.tr.utf8
@@ -29,6 +29,7 @@
ko |
tr
+ Bu çeviri güncel olmayabilir. Son deÄiÅiklikler için Ä°ngilizce sürüm geçerlidir.
Yapılandırma dosyalarındaki
yönergeler sunucunun tamamına uygulanacaÄı gibi sadece belli dizinler,
diff --git a/docs/manual/sitemap.html.de b/docs/manual/sitemap.html.de
index 36dc52b596..16b8742381 100644
--- a/docs/manual/sitemap.html.de
+++ b/docs/manual/sitemap.html.de
@@ -280,6 +280,7 @@ HPUX betreiben
Apache-Modul mod_proxy_http
Apache-Modul mod_proxy_http2
Apache-Modul mod_proxy_scgi
+Apache-Modul mod_proxy_uwsgi
Apache-Modul mod_proxy_wstunnel
Apache-Modul mod_ratelimit
Apache-Modul mod_reflector
diff --git a/docs/manual/sitemap.html.en b/docs/manual/sitemap.html.en
index ba31666958..39e3aceb4d 100644
--- a/docs/manual/sitemap.html.en
+++ b/docs/manual/sitemap.html.en
@@ -279,6 +279,7 @@ log_server_status
Apache Module mod_proxy_http
Apache Module mod_proxy_http2
Apache Module mod_proxy_scgi
+Apache Module mod_proxy_uwsgi
Apache Module mod_proxy_wstunnel
Apache Module mod_ratelimit
Apache Module mod_reflector
diff --git a/docs/manual/sitemap.html.es b/docs/manual/sitemap.html.es
index 5fd827a18d..0013111b03 100644
--- a/docs/manual/sitemap.html.es
+++ b/docs/manual/sitemap.html.es
@@ -259,6 +259,7 @@ usados para describir las directivas de Apache
Módulo Apache mod_proxy_http
Módulo Apache mod_proxy_http2
Módulo Apache mod_proxy_scgi
+Módulo Apache mod_proxy_uwsgi
Módulo Apache mod_proxy_wstunnel
Módulo Apache mod_ratelimit
Módulo Apache mod_reflector
diff --git a/docs/manual/sitemap.html.ja.utf8 b/docs/manual/sitemap.html.ja.utf8
index 54079545b9..bf61923cf8 100644
--- a/docs/manual/sitemap.html.ja.utf8
+++ b/docs/manual/sitemap.html.ja.utf8
@@ -258,6 +258,7 @@
Apache ã¢ã¸ã¥ã¼ã« mod_proxy_http
Apache ã¢ã¸ã¥ã¼ã« mod_proxy_http2
Apache ã¢ã¸ã¥ã¼ã« mod_proxy_scgi
+Apache ã¢ã¸ã¥ã¼ã« mod_proxy_uwsgi
Apache ã¢ã¸ã¥ã¼ã« mod_proxy_wstunnel
Apache ã¢ã¸ã¥ã¼ã« mod_ratelimit
Apache ã¢ã¸ã¥ã¼ã« mod_reflector
diff --git a/docs/manual/sitemap.html.tr.utf8 b/docs/manual/sitemap.html.tr.utf8
index 21ebf0290b..0350d457c0 100644
--- a/docs/manual/sitemap.html.tr.utf8
+++ b/docs/manual/sitemap.html.tr.utf8
@@ -274,6 +274,7 @@ Windows ile Apache Kullanımı
Apache Modülü mod_proxy_http
Apache Modülü mod_proxy_http2
Apache Modülü mod_proxy_scgi
+Apache Modülü mod_proxy_uwsgi
Apache Modülü mod_proxy_wstunnel
Apache Modülü mod_ratelimit
Apache Modülü mod_reflector
diff --git a/docs/manual/sitemap.html.zh-cn.utf8 b/docs/manual/sitemap.html.zh-cn.utf8
index fafa174013..fa54e77275 100644
--- a/docs/manual/sitemap.html.zh-cn.utf8
+++ b/docs/manual/sitemap.html.zh-cn.utf8
@@ -258,6 +258,7 @@
Apache 模å mod_proxy_http
Apache 模å mod_proxy_http2
Apache 模å mod_proxy_scgi
+Apache 模å mod_proxy_uwsgi
Apache 模å mod_proxy_wstunnel
Apache 模å mod_ratelimit
Apache 模å mod_reflector
diff --git a/include/ap_release.h b/include/ap_release.h
index 9f26aeaace..2d6e35796e 100644
--- a/include/ap_release.h
+++ b/include/ap_release.h
@@ -43,7 +43,7 @@
#define AP_SERVER_MAJORVERSION_NUMBER 2
#define AP_SERVER_MINORVERSION_NUMBER 4
-#define AP_SERVER_PATCHLEVEL_NUMBER 30
+#define AP_SERVER_PATCHLEVEL_NUMBER 31
#define AP_SERVER_DEVBUILD_BOOLEAN 1
/* Synchronize the above with docs/manual/style/version.ent */
|
|