Rebuild.

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

XML updates.

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

Add missing CHANGES entry related to PR 61511

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

Add missing CHANGES entry related to PR 58688

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

more style fixes

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

add security: prefix consistently

bump CVE's to top of each release

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

Updates for announcement of 2.4.33

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

Add compatibility note for 'RegisterHttpMethod'
(backported in 2.4.x in 1772678)

(similar to r1827610 in trunk)

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

Fix revision of a compatibility note
(one should always save open documents before pushing anything...)

(r1827608 in trunk)

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

Add compatibility note for the 3rd argument of 'RewriteMap'
(backported in 2.4.x in 1811748)

Improve doc highlight

(r1827603 and r1827605) in trunk

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

Document the 3rd argument of 'RewriteMap'
(r1664575 in trunk)

Compatibility note will be added in the next commit.

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

note two recent tags not released

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

Part of my comment is already addressed in another backport proposal

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

Comment on backport proposal

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

Propose.

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

Propose, fix links.

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

Merge r1816110 from trunk:

Document special cases where changing Listen across a restart will
fail.

PR: 61666

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

Propose.

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

svn:eol-style = native

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

update transformation

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

Merge r1827359 from trunk:

PR62200: EBCDIC: ap_rgetline APR_ENOSPC

On EBCDIC systems, translation does not occur in ap_rgetline() if the line is
larger than the buffer size.

(note: No STATUS vote for EBCDIC fix)

Submitted By: Hank Ibell
Committed By: covener

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

rebuild

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

Improve highlight and fix a few typo.
Mostly some missing <var></var> and <module></module>
(r1827353 in trunk)

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

Proposing backport for mod_remoteip fix for HTTP/2 connections.

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

Post 2.4.33 tag updates

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

Get ready to tag httpd 2.4.33

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

Vote in haste

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

Note the 2.4.32 thing that happened

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

Backported in r1827108.

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

Merge r1826686 from trunk:

Instrument 'md_log_perror' and fix corresponding errors reported by gcc.

Submitted by: jailletc36
Reviewed by: jailletc36, ylavic, covener

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

Rebuild.

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

XML update.

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

adding r1827001 to backport proposal

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

backport proposal for r1826995

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

Propose.

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

Reverting proposal again: compilation test reveals
that SSL_get_server_tmp_key is only OpenSSL 1.0.2+.
But it seems the whole feature doesn't make sense
without SSL_get_server_tmp_key.
For the sake of completeness: EVP_PKEY_id also isn't
part of 0.9.8a.

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

Add log msg from Yann's addition to proposal.

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

Proposing this again, now with Yann's addition.
The OpenSSL 1.0.2 dependency is not a problem, because
it is used only conditionally if 1.0.2 is available,
but not for older versions.

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

Votes (applies cleanly in order).

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

Thanks Yann for your additional patch but on second
thought the whole feature can't be backported
due to our support of OpenSSL 0.9.8 in 2.4.x
and EC_curve_nid2nist() is only available in
1.0.2+.

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

Follow up to r1826899: backported.

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

Merge r1826556, r1826847 from trunk:

Fix timeout logging in ap_process_request().

We can't use 'r' after ap_process_request_after_handler(), the core output
filter might have cleaned up its deferred bucket brigade on error, including
the EOR bucket.

Reported by: steffenal
Closes SpiderLabs/ModSecurity#1542

Follow up to r1826556: CHANGES entry.

Submitted by: ylavic
Reviewed by: ylavic, covener, rjung

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

Follow up to r1826897: backported.

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

Merge r1826845 from trunk:

mod_slotmem_shm: SHMs need to be attached in MPM winnt children processes.

We can't (re-)create them since they exist already and are owned by the
parent process.

Submitted by: ylavic
Reviewed by: ylavic, covener, rjung

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

Patches now uploaded, sorry.
Removed comments.

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

Follow up to r1826891: missing mergeinfo.

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

Comment.

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

Vote, promote.

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

Merge 1710403 from trunk:

htpasswd/htdigest: Disable support for bcrypt on EBCDIC platforms.
apr-util's bcrypt implementation doesn't tolerate EBCDIC.

Submitted by: rjung
Reviewed by: rjung, covener, ylavic

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

Merge 1626956 and 1628388 from trunk:

ab: try all destination socket addresses returned by apr_sockaddr_info_get
instead of failing on first one when not available.
Needed for instance if localhost resolves to both ::1 and 127.0.0.1
e.g. if both are in /etc/hosts.

ab: Use only one connection to determine working destination socket address.

Submitted by: rjung
Reviewed by: rjung, covener, ylavic

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

Typo.

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

Anticipated +1.

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

Merge 1781516 fro trunk:

htpasswd/htdbm: report the right limit when get_password()
overflows.

Submitted by: rjung
Reviewed by: rjung, covener, jailletc36

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

Merge 1812756 from trunk:

htpasswd: Don't fail in -v mode if password file is unwritable.
PR 61631.

Submitted by: rjung
Reviewed by: rjung, ylavic, covener

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

Merge 1781509 from trunk:

htpasswd: don't point to (unused) stack memory on output
to make static analysers happy.  PR 60634.

Submitted by: rjung
Reviewed by: rjung, ylavic, covener

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

Merge 1821767 from trunk:

LibreSSL doesn't have or require applink.c

Submitted by: rjung
Reviewed by: rjung, ylavic, covener

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

More votes and comments.

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

Vote/promote, comment.

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

Makes sense, withdrawing.

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

Easy vote + promote

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

Slightly improve syntax highlight
(r1826856 in trunk)

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

vote/promote/comment

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

Easy votes.

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

Proposing style :)

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

Propose.

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

Propose backports bringing rotatelogs in sync
with trunk.

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

Add small backport proposals for htpasswd, htdbm
and htdigest bringing them in sync with trunk.

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

Propose ab patch for minor problem detected
during 2.4.32 testing (thanks to Joe for pointing
out the trunk fix) and two more small changes
bringing 2.4 ab in sync with trunk ab.

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

Propose

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

Revert r1826543, was meant for trunk...

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

Fix timeout logging in ap_process_request().

We can't use 'r' after ap_process_request_after_handler(), the core output
filter might have cleaned up its deferred bucket brigade on error, including
the EOR bucket.

Reported by: steffenal
Fixes SpiderLabs/ModSecurity#1542

[Reverted by r1826555]

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

documentation rebuild

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

mod_md.xml: update the Let’s Encrypt Subscriber Agreement link

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

Rebuild.

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

XML updates.

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

Post 2.4.32 tag updates

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

Get ready to tag httpd 2.4.32

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

Update mergeinfo only: r1487775 was merged (indirectly) from
trunk to 2.4.x in r1824187.

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

Update mergeinfo only: 1374214,1374216,1375445,1467593 were merged
from trunk to 2.4.x in r1476685.

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

Add a missing word in the French translation
(r1826318 in trunk)

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

-tabs

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

Revival (while being discussed :p ).

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

Merged*4, thx for reviews!

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

Merge r1617913 from trunk:

* support/ab.c: Fix crash caused by integer overflow when printing stats with
lot of requests (for example -n 500000000).

Submitted by: jkaluza
Reviewed by: jorton, jim, ylavic

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

Merge r1667676, r1826207 from trunk:

* mod_access_compat, mod_authz_host: Handle '#' character.
For mod_access_compat, disable '#' in hostname completely.
For mod_authz_host, treat '#' as a comment and ignore everything after that.
This allows better handling of admin errors like
'Require host localhost# Add example.com later'.

* modules/aaa/mod_authz_host.c (host_check_authorization): Simplify
  comment stripping in "Require host"; log a warning if a comment is
  used in 'Require host', or an error if the expression is empty with
  the comment stripped. (Currently in 2.4, #comment part is parsed)

Submitted by: jkaluza, jorton
Reviewed by: jorton, jim, ylavic

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

Merge r1532281, r1532289, r1537718 from trunk:

* support/rotatelogs.c (get_now): Return the offset applied to the
  Unix time as a parameter.
  (doRotate): When exploding the time for strtfime formatting, iff in
  -l mode, subtract the offset and explode the real Unix time as a
  local time so %Z etc works correctly.

* support/rotatelogs.c (get_now): Fix the NULL ptr dereferences
  added in r1532281.

* support/rotatelogs.c: Introduce an adjusted_time_t type to store the
  weird "adjusted time since epoch" type returned by get_now().
  Switch from int to long to fix an unnecessary Y2K38 issue.  Adjust
  use throughout and clean up other type issues.  No functional change
  intended apart from fixing Y2K38.

Submitted by: jorton
Reviewed by: jorton, jim, ylavic

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

Merge r1811976 from trunk:

Add optional _RAW suffix to SSL_*_DN_xx attribute names, allowing
users to convert an attribute value without conversion to UTF-8.  (A
public CA has issued certs with attributes tagged as the wrong ASN.1
string types.)

* modules/ssl/ssl_util_ssl.c (asn1_string_convert): Rename from
  asn1_string_to_utf8; add raw argument. Reimplement _to_utf8 as
  macro.
  (modssl_X509_NAME_ENTRY_to_string): Add raw argument.

* modules/ssl/ssl_engine_vars.c (ssl_var_lookup_ssl_cert_dn): Use raw
  string conversion if _RAW suffix is present in DN component.

Submitted by: jorton
Reviewed by: jorton, jim, ylavic

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

Update link (STALLED, but seems related to PR 62167, should we discuss it...).

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

Vote, promote.

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

Vote, promote.

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

Backport votes

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

Propose.

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

Propose.

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

Propose.

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

Propose.

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

Update mergeinfo only: r1735891 was merged to 2.4.x in r1787728.

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

Note that 2.4.32 is in development

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

Add mergeinfo for r1825839.

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

Sorry, 2.4.31. It just isn't your day.

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

backported

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