Merge from trunk:
Submitted by: jim
Reviewed by: 1900340

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

Note missing link [skip ci]

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

More proposals [skip ci]

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

Note associated PR [skip ci]

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

Propose [skip ci]

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

Add missing revision in merge command [skip ci].

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

Vote, promote [skip ci].

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

Merge  /httpd/httpd/trunk:r1899841

mod_heartmonitor: Fix setting and comparison of IPs fields.

Setting or comparing hm_server_t and hm_slot_server_t IPs should not be base
on MAXIPSIZE since the former is potentially a smaller const char*.

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

Remove backported entry

[skip ci]

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

mod_proxy: Add backend port to log messages to
ease identification of involved service.

Merge r1900028 from trunk.
Submitted by: rjung
Reviewed by: rjung, jim, rpluem

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

Merge /httpd/httpd/trunk:r1900875

  *) test: switch rustls-ffi to v0.9.0 which gets
     rid of the cbindgen dependency.

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

Merge  /httpd/httpd/trunk:r1900852,1900887

  *) mod_md: the `MDCertificateAuthority` directive can take more than one URL/name of
     an ACME CA. This gives a failover for renewals when several consecutive attempts
     to get a certificate failed.
     A new directive was added: `MDRetryDelay` sets the delay of retries.
     A new directive was added: `MDRetryFailover` sets the number of errored
     attempts before an alternate CA is selected for certificate renewals.

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

* Promote [skip ci]

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

* Vote and comment [skip ci]

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

* Vote [skip ci]

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

Remove backported entry

[skip ci]

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

Merge r1898453 from trunk

   * mod_lua: ap_lua_init_mutex() is not about thread only. It also calls
apr_global_mutex_child_init(). So I see no good reason to skip this hook
if !APR_HAS_THREADS.

Some #if APR_HAS_THREADS are also already in place in
ap_lua_init_mutex() anyway.

Submitted by: jailletc36
Reviewed by: jaillect36, ylavic, rpluem
Backported by: jailletc36

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

  *) test: log rustc and cbindget versions used to build rustls-ffi
     to speed up analysis of any problems in the future.

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

  *) test: backport the cbindgen workaround for building rustls-ffi
     so that rustc and cbindget are in a combination that works on
     focal.

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

Merge r1899451, r1899454, r1899562, r1899564, r1899584, r1899886 from trunk:

* Close the connection in case an EOC bucket was seen

* In case we see an EOC bucket and there was an error bucket before, use its
  status as status for the request. This should ensure proper status logging
  in the access log.

* We need to set r->status on each call after we noticed an EOC as
  data bucket generators like ap_die might have changed the status
  code. But we know better in this case and insist on the status
  code that we have seen in the error bucket.

* Keep track of the number of keepalives we processed on this connection.

* Report a broken backend in case reading the response line failed on the
  first request on this connection otherwise we assume we have just run
  into a keepalive race and the backend is still healthy.

* Add Changelog for r1899451, r1899454, r1899562, r1899564, r1899584

Submitted by: rpluem
Reviewed by: jim

Github: closes #314

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

promote

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

r1900751.

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

promote

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

Merge r1900026 from trunk:

  *) mod_heartmonitor: Set the documented default value
     "10" for HeartbeatMaxServers instead of "0". With "0"
     no shared memory slotmem was initialized. [Rainer Jung]

Submitted by: rjung
Reviewed by: 1899841

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

Votes

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

Xforms

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

Fix a typo (s/virtal/virtual) and add a missing hyper-link.

r1900689 in trunk

[skip ci]

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

fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900657 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@1900656 13f79535-47bb-0310-9956-ffa450edef68

Merge /httpd/httpd/trunk:r1900628

  *) mod_md:  fixed a bug leading to failed transfers for OCSP
     stapling information when more than 6 certificates needed
     updates in the same run.

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

* Propose [skip ci]

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

propose backport h2 [skip ci]

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

httpd 2.4.x and above require at least APR 1.3, so this is always the case.
Simplify the wording in the doc.

r1900557 in trunk

[skip ci]

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

httpd 2.4.x and above require at least APR 1.3, so this is always the case.
Simplify the wording in the doc.

r1900525 in trunk

[skip ci]

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

fr doc rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1900428 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@1900427 13f79535-47bb-0310-9956-ffa450edef68

vote [skip ci]

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

Propose

[skip ci]

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

Vote

[skip ci]

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

Remove proposal after backport of mod_md change, experimental mods do not need RTC.
[skip ci]

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

backport proposal for PR66037 fix.
[skip ci]

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

Fix formatting of CHANGES entry.
CTR
[skip ci]

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

Merge /httpd/httpd/trunk:r1898962,1900039,1900145,1900313-1900314

Backport of all recent changes to experimental mod_md.

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

Vote
[skip ci]

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

backport proposal for recent mod_md changes.
[skip ci]

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

Propose.
[skip ci]

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

* Vote [skip ci]

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

* Vote [skip ci]

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

Reset vote, use changes-entries, add additional
fix by ylavic.
[skip ci]

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

Adding r1899905 for the ap_escape_quotes backport.
[skip ci]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1899907 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@1899891 13f79535-47bb-0310-9956-ffa450edef68

Vote, comment [skip ci]

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

* Vote

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

* Add proposal

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

Add proposal.
[skip ci]

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

- postpoing http2 backport
- adding core fix for ap_escape_quotes() on huge strings.
[skip ci]

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

fr doc rebuild.

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

XML files updates.

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

xforms

[skip ci]

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

Merge r1605841 from trunk:

- ignore <br> inside <dd> too, since ab.xml is using that,
  though it's kind of wrong

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

Merge r1899269 from trunk:

add -n warnings/quirks

https://bz.apache.org/bugzilla/show_bug.cgi?id=65980

[skip ci]

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

Fix a typo.
PR 65978.

Thanks to Stefan Hamburger <apache_f5dosu stefanhamburger.de> for finding it.

(r1899234 in trunk)
[skip ci]

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

fr doc rebuild.

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

fr doc XML doc file update.

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

'interpolate' is a keyword, not a user-defined string.
So it should not be in <var></var> in <syntax>  and  <code> should be used instead of <var> in explanations.

While at it, fix some other style issues and missing links spotted here and there.

(t1899205 in trunk)

[skip ci]

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

publishing release httpd-2.4.53

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

 update transformations.

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

update for sync with English docs.

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

fr doc rebuild.

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

XML files updates.-Cette ligne, et les suivantes ci-dessous, seront ignorées--

M    manual/mod/core.xml.fr
M    manual/mod/mod_proxy.xml.fr
M    manual/rewrite/avoid.xml.fr
M    manual/rewrite/flags.xml.fr

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

Merge r1898771 from trunk:

* Improve detection of _Thread_local

GCC < 4.9 reports __STDC_VERSION__ >= 201112 but does not implement
_Thread_local. Take care of this in the condition.

See: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203066

Reviewed by: ylavic, covener, rpluem

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

* Vote [skip ci]

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

vote [skip ci]

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

Propose r1898771 [skip ci]

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

Merge r1898735 from trunk:

* Improve the logic flow

Reviewed by: rpluem, covener, ylavic

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

Sync docs [skip ci]

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

Merge r1898702 from trunk:

  *) docs: fixing missing closing tag.

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

Sync CHANGES entries [skip ci]

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

mod_sed: use size_t to allow for larger buffer sizes and unsigned arithmetics.

Let's switch to apr_size_t buffers and get rid of the ints.

Merge r1898690 from trunk.
Submitted by: rpluem
Reviewed by: rpluem, covener, ylavic

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

mod_lua: Error out if lua_read_body() or lua_write_body() fail.

Otherwise r:requestbody() or r:parsebody() failures might go unnoticed for
the user.

Merge r1898689 from trunk.
Submitted by: rpluem
Reviewed by: rpluem, covener, ylavic

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

core: Make sure and check that LimitXMLRequestBody fits in system memory.

LimitXMLRequestBody can not exceed the size needed to ap_escape_html2() the
body without failing to allocate memory, so enforce this at load time based
on APR_SIZE_MAX, and make sure that ap_escape_html2() is within the bounds.

Document the limits for LimitXMLRequestBody in our docs.

Merge r1898686 from trunk.
Submitted by: ylavic, rpluem
Reviewed by: ylavic, covener, rpluem

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

core: Simpler connection close logic if discarding the request body fails.

If ap_discard_request_body() sets AP_CONN_CLOSE by itself it simplifies and
allows to consolidate end_output_stream() and error_output_stream().

Merge r1898683 from trunk.
Submitted by: ylavic, rpluem
Reviewed by: ylavic, rpluem, covener

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

Sync CHANGES entries [skip ci]

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

Merge r1898671 from trunk:

Adjust Travis branch-matching conditions to treat any
branch starting "2.4" like 2.4.x (in addition to
"candidate-2.4").

[under CTR for Travis exemption]

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

xforms

[skip ci]

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

Fix the compatibility note for ProxyErrorOverride used with error code. (revision 2.4.47 based on CHANGES)

[skip ci]

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

Synch with trunk and add a missing word.

[skip ci]

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

'samesite' in CO is available since 2.4.47.

While at it, remove some trainling spaces to synch with trunk.

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

propose

[skip ci]

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

update after backport before last backport - crazy times [skip ci]

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

update after backport [skip ci]

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

Merge of 1891019,1891023 from trunk:

  *) dbm: Split the loading of a dbm driver from the opening of a dbm file. When
     an attempt to load a dbm driver fails, log clearly which driver triggered
     the error (not "default"), and what the error was.

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

Revert of 1898566, backport of dbm loading, to allow clean apply of proposed patch.

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

Merge of r1896253,r1897859 from trunk (via PR 288):

  *) mod_proxy: Bump shared worker name to 384 chars. PR 53218

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

update after backport [skip ci]

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

merge of 1898146,1898173 from trunk:

  *) mod_http2: preserve the port number given in a HTTP/1.1
     request that was Upgraded to HTTP/2. Fixes PR65881.

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

dbm backport approved and merged

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

promote

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

tested and voted

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

cleanup after backport [skip ci]

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