Merge r1874689 from trunk:

  *) mod_http2: Fixes issue where mod_unique_id would generate non-unique request
     identifier under load, see <https://github.com/icing/mod_h2/issues/195>.
     [Michael Kaufmann, Stefan Eissing]

Submitted by: icing
Reviewed by: icing, ylavic, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874909 13f79535-47bb-0310-9956-ffa450edef68

Merge r1874616 from trunk:

PR64140: Allow %{Content-Type} in health check expressions

Submitted By: Renier Velazco <renier.velazco upr.edu>
Commited By: covener

Github: closes #97

Submitted by: covener
Reviewed by: covener, ylavic, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874908 13f79535-47bb-0310-9956-ffa450edef68

Merge r1874424 from trunk:

PR64172: drop severity of AH01666

Submitted by: covener
Reviewed by: covener, ylavic, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874907 13f79535-47bb-0310-9956-ffa450edef68

promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874906 13f79535-47bb-0310-9956-ffa450edef68

provide votes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874905 13f79535-47bb-0310-9956-ffa450edef68

done [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874867 13f79535-47bb-0310-9956-ffa450edef68

Merge r1874346, r1874545, r1874558 from trunk:

Avoid printing NULL strings in logs

Avoid printing NULL strings in logs

"?:" is a GNU extension, use standard syntax
spotted by Christophe Jaillet

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874866 13f79535-47bb-0310-9956-ffa450edef68

done [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874865 13f79535-47bb-0310-9956-ffa450edef68

restore CHANGES entry [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874864 13f79535-47bb-0310-9956-ffa450edef68

Merge r1874389, r1874480, r1874601 from trunk:

PR64077: samesite/httponly/secure flags for usertrack

Submitted By: Prashant Keshvani <prashant2400 gmail.com>, Eric Covener
Committed By: covener

* Whitespace fix

Remove duplicated "CookieTracking" directive in 'command_rec'.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874863 13f79535-47bb-0310-9956-ffa450edef68

promote [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874862 13f79535-47bb-0310-9956-ffa450edef68

* Vote and promote [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874774 13f79535-47bb-0310-9956-ffa450edef68

* As this is a regression it looks like ablocker to me [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874773 13f79535-47bb-0310-9956-ffa450edef68

tabs [skip ci].

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874766 13f79535-47bb-0310-9956-ffa450edef68

Vote, promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874765 13f79535-47bb-0310-9956-ffa450edef68

Propose.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874759 13f79535-47bb-0310-9956-ffa450edef68

backport porposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874690 13f79535-47bb-0310-9956-ffa450edef68

fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874648 13f79535-47bb-0310-9956-ffa450edef68

fr doc XML file update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874647 13f79535-47bb-0310-9956-ffa450edef68

Fix a commit number in a backport proposal  [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874641 13f79535-47bb-0310-9956-ffa450edef68

propose healthcheck fix [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874617 13f79535-47bb-0310-9956-ffa450edef68

Add a note [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874603 13f79535-47bb-0310-9956-ffa450edef68

vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874599 13f79535-47bb-0310-9956-ffa450edef68

Propose fix for compilation failure on Windows after r1874281. [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874569 13f79535-47bb-0310-9956-ffa450edef68

Backported.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874565 13f79535-47bb-0310-9956-ffa450edef68

Doc for secret in AJP.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874564 13f79535-47bb-0310-9956-ffa450edef68

update patch info and vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874559 13f79535-47bb-0310-9956-ffa450edef68

Propose r1874346,1874545 for back port.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874547 13f79535-47bb-0310-9956-ffa450edef68

fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874519 13f79535-47bb-0310-9956-ffa450edef68

fr doc XML files updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874518 13f79535-47bb-0310-9956-ffa450edef68

* Fix typo and adjust formating

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874483 13f79535-47bb-0310-9956-ffa450edef68

mod_proxy_ajp: Add "secret" parameter to proxy workers
to implement legacy AJP13 authentication.  PR 53098.
The attribute is now suggested/required by tomcat.

Backport of r1738878 from trunk.

Backported by: covener
Reviewed by: covener, jorton, rjung

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874456 13f79535-47bb-0310-9956-ffa450edef68

Fix broken docs xml, misplaced </usage> tag [skip ci].

Backport of r1869606 from trunk (CTR).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874455 13f79535-47bb-0310-9956-ffa450edef68

Promote and [skip ci].

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874454 13f79535-47bb-0310-9956-ffa450edef68

Vote and [skip ci].

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874453 13f79535-47bb-0310-9956-ffa450edef68

Vote and [skip ci].

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874451 13f79535-47bb-0310-9956-ffa450edef68

propose AJP secret fix [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874445 13f79535-47bb-0310-9956-ffa450edef68

propose logging change [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874425 13f79535-47bb-0310-9956-ffa450edef68

propose contributed usertrack patch [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874391 13f79535-47bb-0310-9956-ffa450edef68

mpm_event: avoid possible KeepAlveTimeout off by -100 ms.

trunk patch: http://svn.apache.org/r1874277
2.4.x patch: svn merge -c 1874277 ^/httpd/httpd/trunk .

+1: ylavic, covener, minfrin

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874350 13f79535-47bb-0310-9956-ffa450edef68

Vote and promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874349 13f79535-47bb-0310-9956-ffa450edef68

Backported.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874348 13f79535-47bb-0310-9956-ffa450edef68

mod_http2: Fix an empty APLOGNO()

trunk patch: http://svn.apache.org/r1873927
2.4.x patch: svn merge -c 1873927 ^/httpd/httpd/trunk .

+1: jailletc36, ylavic, minfrin

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874347 13f79535-47bb-0310-9956-ffa450edef68

Vote and promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874345 13f79535-47bb-0310-9956-ffa450edef68

Backported in r1874134.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874304 13f79535-47bb-0310-9956-ffa450edef68

Backported. [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874291 13f79535-47bb-0310-9956-ffa450edef68

Merge r1872036, r1872093, r1872102 from trunk:

Add a config layout for OpenWRT.

Align the OpenWRT config layout with the new kayout as defined by the project.

Correct the case on OpenWrt, the project prefers this capitalisation.

Submitted by: minfrin
Reviewed by: minfrin, jim, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874290 13f79535-47bb-0310-9956-ffa450edef68

Backported. [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874289 13f79535-47bb-0310-9956-ffa450edef68

Merge r1872042, r1872062 from trunk:

Add support for cross compiling to apxs. If apxs is being executed from somewhere
other than its target location, add that prefix to includes and library directories.
Without this, apxs would fail to find config_vars.mk and exit.

Allow instdso.sh to be found while cross compiling.

Submitted by: minfrin
Reviewed by: minfrin, jim, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874288 13f79535-47bb-0310-9956-ffa450edef68

Backported. [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874287 13f79535-47bb-0310-9956-ffa450edef68

Merge r1873985 from trunk:

Fix spelling errors found by codespell.  [skip ci]

Submitted by: mrumph
Reviewed by: mrumph, jim, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874286 13f79535-47bb-0310-9956-ffa450edef68

Backported. [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874284 13f79535-47bb-0310-9956-ffa450edef68

Merge r1873888 from trunk:

  *) mod_ssl: Disable client verification on ACME ALPN challenges. Fixes github
     issue mod_md#172 (https://github.com/icing/mod_md/issues/172).
     [Michael Kaufmann <mail michael-kaufmann.ch>, Stefan Eissing]

Submitted by: icing
Reviewed by: icing, jim, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874283 13f79535-47bb-0310-9956-ffa450edef68

Backported. [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874282 13f79535-47bb-0310-9956-ffa450edef68

Merge r1861950 from trunk:

mod_ssl: use OPENSSL_init_ssl() to initialise OpenSSL on versions 1.1+.

Reference: http://openssl.6102.n7.nabble.com/Shutting-down-openssl-is-the-correct-thing-to-do-nothing-td76857.html#a76862

Submitted by: minfrin
Reviewed by: minfrin, jim, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874281 13f79535-47bb-0310-9956-ffa450edef68

vote [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874280 13f79535-47bb-0310-9956-ffa450edef68

Vote+promote. [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874279 13f79535-47bb-0310-9956-ffa450edef68

Propose, vote+promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874278 13f79535-47bb-0310-9956-ffa450edef68

Transforms. [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874245 13f79535-47bb-0310-9956-ffa450edef68

Merge r1874243 from trunk:

PKCS#11 URIs usable from 2.4.42 and later now. [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874244 13f79535-47bb-0310-9956-ffa450edef68

* Backported in r1874196, r1874201, r1874202 [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874239 13f79535-47bb-0310-9956-ffa450edef68

Update mergeinfo. [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874202 13f79535-47bb-0310-9956-ffa450edef68

Sync PKCS#11 docs from trunk. [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874201 13f79535-47bb-0310-9956-ffa450edef68

Merge r1830819, r1830912, r1830913, r1830927, r1831168, r1831173, r1835240, r1835242, r1835615, r1836547 from trunk:

mod_ssl: Add support for loading private keys from ENGINEs.  Support
for PKCS#11 URIs only, and PIN entry is not threaded through
SSLPassPhraseDialog config yet.

* modules/ssl/ssl_util.c (modssl_is_engine_key): New function.

* modules/ssl/ssl_engine_config.c (ssl_cmd_SSLCertificateKeyFile):
  Use it, skip check for file existence for engine keys.

* modules/ssl/ssl_engine_pphrase.c (modssl_load_engine_pkey):
  New function.

* modules/ssl/ssl_engine_init.c (ssl_init_server_certs):
  For engine keys, load via modssl_load_engine_pkey.

* modules/ssl/ssl_util_ssl.c, modules/ssl/ssl_util_ssl.h:
  Remove modssl_read_encrypted_pkey() and helpers, added in r1804087
  but never used.

* modules/ssl/ssl_util_ssl.c (modssl_read_privatekey): Remove unused
  second argument.

* modules/ssl/ssl_engine_pphrase.c (ssl_load_encrypted_pkey): Adjust
  accordingly.

Simplify the ssl_asn1_table API, remove abstraction (it is used only
to cache serialized EVP_PKEYs not any char * blobs), and document.

* modules/ssl/ssl_util.c (ssl_asn1_table_set): Take the EVP_PKEY and
  serialize internally.  Use ap_realloc.  Return the ssl_asn1_t *
  pointer.  Don't call apr_hash_set() for unchanged pointer case.

* modules/ssl/ssl_engine_pphrase.c (ssl_load_encrypted_pkey):
  Adjust for the above.

* modules/ssl/ssl_private.h: Adjust as above, add docs.

mod_ssl: Add support for loading TLS certificates through the PKCS#11
engine.

* modules/ssl/ssl_util.c (modssl_is_engine_id): Renamed
  from modssl_is_engine_key.

* modules/ssl/ssl_engine_config.c (ssl_cmd_SSLCertificateKeyFile):
  Adjust accordingly.
  (ssl_cmd_SSLCertificateFile): Also allow ENGINE cert ids.

* modules/ssl/ssl_engine_pphrase.c (modssl_load_engine_keypair):
  Rename from modssl_load_engine_key; load certificate if
  cert id is passed.

* modules/ssl/ssl_engine_init.c (ssl_init_server_certs): Optionally
  load the certificate from the engine as well.

* docs/manual/: Update manual.

* modules/ssl/ssl_engine_init.c (ssl_init_server_certs): Add error
  logno. Free EVP_PKEY in engine case.  Never try reading ECDH/DH
  parameters from engine ids.

Hook up PKCS#11 PIN entry through configured passphrase entry method.

* modules/ssl/ssl_engine_pphrase.c: Add wrappers for OpenSSL UI * API
  around passphrase entry.
  (modssl_load_engine_keypair): Take vhost ID and use above rather than
  default OpenSSL UI.

* modules/ssl/ssl_engine_init.c (ssl_init_server_certs): Pass vhost ID.

Submitted by: Anderson Sasaki<ansaski redhat.com>, jorton

* modules/ssl/ssl_engine_pphrase.c: Add logno tags.

* modules/ssl/ssl_engine_pphrase.c (modssl_load_engine_keypair): Load
  the engine associated with the private key (&cert) explicitly
  rather than requiring the engine to be set as the default method
  for all operations (with "SSLCryptoDevice <engine>").

(Thanks to Anderson Sasaki <ansasaki redhat.com> for suggested
improvement and guidance)

* modules/ssl/ssl_engine_pphrase.c: Fix linking against OpenSSL without
  ENGINE support.

Submitted by: Anderson Sasaki <ansasaki redhat.com>, jorton
Reviewed by: jorton, jim, ylavic
Github: closes #92

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874196 13f79535-47bb-0310-9956-ffa450edef68

the show goes on

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874192 13f79535-47bb-0310-9956-ffa450edef68

add AP_REG_NO_DEFAULT to allow opt-out of pcre defaults

... and use it in mod_substitute to avoid DOTALL

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874191 13f79535-47bb-0310-9956-ffa450edef68

Merge of r1874188 from trunk:

 * mod_md: fix of version string

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874189 13f79535-47bb-0310-9956-ffa450edef68

Fix spelling errors in docs found by codespell.  [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874169 13f79535-47bb-0310-9956-ffa450edef68

Merged /httpd/httpd/trunk:r1870020,1874133

  *) mod_md:
     - Prefer MDContactEmail directive to ServerAdmin for registration. New directive
       thanks to Timothe Litt (@tlhackque).
     - protocol check for pre-configured "tls-alpn-01" challenge has been improved. It will now
       check all matching virtual hosts for protocol support. Thanks to @mkauf.
     - Corrected a check when OCSP stapling was configured for hosts
       where the responsible MDomain is not clear, by Michal Karm Babacek (@Karm).
     - Softening the restrictions where mod_md configuration directives may appear. This should
       allow for use in <If> and <Macro> sections. If all possible variations lead to the configuration
       you wanted in the first place, is another matter.
     [Michael Kaufmann <mail michael-kaufmann.ch>, Timothe Litt (@tlhackque),
      Michal Karm Babacek (@Karm), Stefan Eissing (@icing)]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874134 13f79535-47bb-0310-9956-ffa450edef68

* Vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874104 13f79535-47bb-0310-9956-ffa450edef68

Update proposal.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874091 13f79535-47bb-0310-9956-ffa450edef68

Propose to hold on accepted backport.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874063 13f79535-47bb-0310-9956-ffa450edef68

Add a note

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874061 13f79535-47bb-0310-9956-ffa450edef68

Vote, promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874060 13f79535-47bb-0310-9956-ffa450edef68

some votes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874058 13f79535-47bb-0310-9956-ffa450edef68

* This actually a blocker as r1873747 introduced a regression

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1874002 13f79535-47bb-0310-9956-ffa450edef68

Propose fix for spelling errors found by codespell.  [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1873992 13f79535-47bb-0310-9956-ffa450edef68

Add CHANGES entry for Travis CI testing.  [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1873987 13f79535-47bb-0310-9956-ffa450edef68

* Already addressed. Otherwise I was fine. [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1873946 13f79535-47bb-0310-9956-ffa450edef68

* Add a comment [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1873945 13f79535-47bb-0310-9956-ffa450edef68

propose substitute fix [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1873944 13f79535-47bb-0310-9956-ffa450edef68

Propose [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1873928 13f79535-47bb-0310-9956-ffa450edef68

Transforms rhymes with [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1873916 13f79535-47bb-0310-9956-ffa450edef68

Merge r1873913 from trunk:

Clarify compatibility and interpretation of CGIDScriptTimeout. [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1873915 13f79535-47bb-0310-9956-ffa450edef68

Merge r1873835, r1873889 from trunk:

mod_systemd.xml: add basic unit example [skip ci]

Add some blurb on correctly stopping the service w/mod_systemd. [skip ci]

Submitted by: elukey, jorton

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1873914 13f79535-47bb-0310-9956-ffa450edef68

CHANGES w/ credit for 1873906

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1873910 13f79535-47bb-0310-9956-ffa450edef68

xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1873908 13f79535-47bb-0310-9956-ffa450edef68

Merge r1868645, r1868743, r1868929, r1868934, r1869077 from trunk:

mod_ssl: negotiate the TLS protocol version per name based vhost configuration.

By using the new ClientHello callback provided by OpenSSL 1.1.1, which runs at
the earliest connection stage, we can switch the SSL_CTX of the SSL connection
early enough for OpenSSL to take into account the protocol configuration of the
vhost.

In other words:
    SSL_set_SSL_CTX(c->SSL, s->SSL_CTX)
followed by:
    SSL_set_{min,max}_proto_version(SSL_CTX_get_{min,max}_proto_version(s->SSL_CTX))
works as expected at this stage (while the same from the SNI callback is
ignored by/due to OpenSSL's state machine).

Extracting the SNI (to select the relevant vhost) in the ClientHello callback
is not as easy as calling SSL_get_servername() though, we have to work with
the raw TLS extensions helpers provided by OpenSSL. I stole this code from a
test in the OpenSSL source code (i.e. client_hello_select_server_ctx() in
test/handshake_helper.c).

We can then call init_vhost() as with the SNI callback (in use only for OpenSSL
versions earlier than 1.1.1 now), and pass it the extracted SNI.

mod_ssl: follow up to r1868645.

Restore ssl_callback_ServerNameIndication() even with OpenSSL 1.1.1+, which
depends on its return value (OK/NOACK), mainly on session resumption, for
SSL_get_servername() to consider or ignore the SNI (returning NULL thus
making SSLStrictSNIVHostCheck fail for possibly legitimate cases).

This means that init_vhost() should accurately return whether the SNI exists
in the configured vhosts, even when it's called multiple times (e.g. first
from ClientHello callback and then from SNI callback), so save that state in
sslconn->vhost_found and reuse it.

mod_ssl: follow up to r1868645.

Keep the base server's SSLProtocol if none is configured on the vhost
selected by Hello/SNI callback.

mod_ssl: follow up to r1868645 and r1868929.

Merge ->protocol_set.

mod_ssl: follow up to r1868645.

CHANGES entry and docs' note.

Submitted by: ylavic
Reviewed by: ylavic, minfrin, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1873907 13f79535-47bb-0310-9956-ffa450edef68

Merge r1873748 from trunk:

factor out TE=chunked checking

Submitted by: covener
Reviewed by: covener, minfrin, jorton

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1873906 13f79535-47bb-0310-9956-ffa450edef68

Merge r1873747 from trunk:

factor out default regex flags

Submitted by: covener
Reviewed by: covener, minfrin, jorton

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1873905 13f79535-47bb-0310-9956-ffa450edef68

Merge r1873745 from trunk:

trap bad FTP responses

Submitted by: covener
Reviewed by: covener, minfrin, jorton

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1873904 13f79535-47bb-0310-9956-ffa450edef68

promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1873903 13f79535-47bb-0310-9956-ffa450edef68

test and vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1873902 13f79535-47bb-0310-9956-ffa450edef68

backport proposal for r1873888.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1873890 13f79535-47bb-0310-9956-ffa450edef68

Vote, promote, [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1873887 13f79535-47bb-0310-9956-ffa450edef68

fr doc rebuild

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1873837 13f79535-47bb-0310-9956-ffa450edef68

XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1873836 13f79535-47bb-0310-9956-ffa450edef68

Add some missing spaces
(r1873820 on trunk)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1873823 13f79535-47bb-0310-9956-ffa450edef68

documentation rebuild [skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1873802 13f79535-47bb-0310-9956-ffa450edef68

...otherwise it was fine.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1873781 13f79535-47bb-0310-9956-ffa450edef68