Merge of r1750392,r1750412,r1750416,r1750474,r1750494,r1750508 from trunk:

mod_proxy_{http,ajp,fcgi}: don't reuse backend connections with data
     available before the request is sent.  PR 57832.

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

vote and promote

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

Merge of r1766308 from trunk:

mod_http2: fixed potential crash in beam memory handling introduced in 1.7.x changes

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

Rebuild.

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

XML updates.

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

Propose.

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

Votes.

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

Vote (adding relevent entries part of the backport proposal).

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

Merge r1766129 from trunk:

Fix -Wunused-but-set-variable warnings.

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

xforms

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

Merge r1766103 from trunk:

Fine tune description

Reviewed/backported by: jim

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

Merge r1766103 from trunk:

Fine tune description

Reviewed/backported by: jim

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

xforms

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

Merge r1766097 from trunk:

Some caching info

Reviewed/backported by: jim

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

Update cache proposal

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

svn:keywords = LastChangedRevision

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

update transformation

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

Merge of r1765420 from trunk:

mod_http2: netware build add new symbol used from nghttp2

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

Merge r1765357 from trunk:

docs: add "threat model" warning to ProxyHTMLMeta

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

Merge of  1764243,1765318 from trunk:

mod_http2/mod_proxy_http2: 100-continue implementation, PING checks on aged backend connections

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

I missed this in r1763229

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

add remoteip thing w/ two reports

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

propose PR58292 fix.

old patch I forgot to backport and don't remember
found by a new user on 2.4

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

Merge of r1764255 from trunk:

mod_proxy_http2: resolving last 2 reported dup symbol clashes

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

Merge of r1764236 from trunk:

mod_proxy_http2: renaming duplicate symbol clash between h2_proxy_util and h2_util externals

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

promote

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

votes

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

Merge r1732228 from trunk:

correct type

Reviewed/backported by: jim

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

Merge r1762517 from trunk:

mod_proxy: log diagnostics during ProxyPass[Match]

To help out users when debugging ProxyPass and ProxyPassMatch, log all
match attempts (at trace2), as well as matches that are either
successful or explicitly disabled (at trace1).
Submitted by: jchampion
Reviewed/backported by: jim

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

Merge r1759984, r1760018 from trunk:

mod_proxy_fcgi: handle the HTTP 412 use case

This is a follow up of http://svn.apache.org/r1752347;
ap_meet_conditions could return a 412 status that if not
handled causes subsequent bogus reads and wrong messages
logged (like AH01070). After a chat on dev@ the feedback
was to couple HTTP_NOT_MODIFIED with HTTP_PRECONDITION_FAILED,
but any other feedback is welcome.

Fix stupid mistake introduced in r1759984
Submitted by: elukey
Reviewed/backported by: jim

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

Vote.

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

Propose the dav_send_one_response() fix for backport.

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

Merge of r1764005 from trunk:

mod_http2: reverting int->apr_uint32_t changes from 1.7.x

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

Rebuild.

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

XML update.

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

Vote and promote

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

Vote, promote.

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

Fixed broken link in my proposal and updated its description

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

xform

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

Merge r1763749 from trunk:

update link to TCP_DEFER_ACCEPT

per http://httpd.apache.org/docs/2.4/mod/core.html#comment_5866

kernel.org links here.

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

Merge of r1763613 from trunk:

mod_http2: fixes compilation error on 32bit systems when generating a slave connection id

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

Vote and proposal

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

Merge of r1763246 from trunk:

mod_http2: fixing Windows build issues by replacing hook with own implemenation

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

catch up to r1763163

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

Merge of 1761479,1761548,1762703,1763158 from trunk

mod_http2: rewrite of how responses and trailers are transferred between
     master and slave connection. Reduction of internal states for tasks
     and streams, stability. Heuristic id generation for slave connections
     to better keep promise of connection ids unique at given point int time.
     Fix for mod_cgid interop in high load situtations.
     Fix for handling of incoming trailers when no request body is sent.

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

Rebuild.

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

xml update.

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

Note a problem with the -Werror proposal

Will follow up on-list.

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

rebuild

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

Show the example of how to do what you said to do

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

Propose (mod_proxy logging).

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

Rebuild

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

XML updates.

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

Merge r1753315, r1753316 from trunk:

configure: move away from obsolete AC_OUTPUT args

AC_OUTPUT's use with arguments was obsoleted back at or before autoconf
2.50. Replace it with the preferred AC_CONFIG_FILES/AC_CONFIG_COMMANDS
calls.

configure: remove orphaned APACHE_OUTPUT macro

The last use of APACHE_OUTPUT appears to have been removed back in
r87231.
Submitted by: jchampion
Reviewed/backported by: jim

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

xforms

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

Backport r1762012 & r1762013
Remove some trailing spaces to synch with trunk

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

Merge of 1761434,1761477 from trunk:

mod_http2: fix for output blocking race condition

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

xform

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

missing paren -- thanks to danielsh

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

xforms

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

emphasize that the config sections are not even used

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

xforms

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

backport & expand on Define in non-global scope.

We can't backport fixing Define, so explain the problem.

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

xforms

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

bld break in hand-resolved conflict

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

Merge r1761272 from trunk:

expand third common in the expression functions doc

Explain some risks at looking at per-request environment variables
set by other modules within <If>.

http://stackoverflow.com/questions/39462011/htaccess-if-else-always-selects-else

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

Rebuild.

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

XML updates.

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

xform

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

Merge r1761215 from trunk:

feedback in   http://httpd.apache.org/docs/2.4/mod/mod_ssl.html#comment_5818

This added paragraph about optional and optional_no_ca isn't helpful.

At the TLS layer, the challenge for otpional and required are no different.

Move the caution about _no_ca up into where the option is defined
and reword.

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

rebuild

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

Votes.

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

lynx isn't common any more

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

Documentation rebuild + variants (proxy_html and dbd)

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

mod_proxy_html doc - Added a reference of ProxyHTMLLinks in the ProxyHTMLURLMap description and some examples.

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

mod_dbd connection info from trunk; rebuild other stuff

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

Rebuild.

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

XML update.

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

XML update.

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

Revert r1760148's mergeinfo changes.

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

Add proposal+vote for mod_proxy_fcgi

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

Vote.

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

Propose.

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

IRC/serverfault question about AH01757

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

Merge r1757010, r1757011 from trunk:

Delay some memory allocation in order to save 272 bytes in the 'request' memory pool if mod_status handler is triggered and is not able to handle the request

Fix <p> tag closing syntax
Submitted by: jailletc36
Reviewed/backported by: jim

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

promote

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

vote

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

Merge r1758307, r1758308, r1758309, r1758311 from trunk:

mpm_winnt: remove 'data' AcceptFilter in favor of 'connect'

The 'data' AcceptFilter optimization instructs Windows to wait until
data is received on a connection before completing the AcceptEx
operation. Unfortunately, it seems this isn't performed atomically --
AcceptEx "partially" accepts the incoming connection during the wait for
data, leaving all other incoming connections in the accept queue. This
opens the server to a denial of service.

Since the fix for this requires a substantial rearchitecture (likely
involving multiple outstanding calls to AcceptEx), disable the 'data'
filter for now and replace it with 'connect', which uses the AcceptEx
interface but does not wait for data.

Users running prior releases of httpd on Windows should explicitly move
to a 'connect' AcceptFilter in their configurations if they are
currently using the default 'data' filter.

Many thanks to mludha, Arthur Ramsey, Paul Spangler, and many others for
their assistance in tracking down and diagnosing this issue.

PR: 59970

mpm_winnt: remove the AcceptEx data network bucket

Follow-up to the prior commit: without an incoming data buffer, the
custom network bucket code is now orphaned and we can remove it
entirely. This has the added benefit that we are no longer using the
internal OVERLAPPED.Pointer field, which is discouraged by the MSDN
docs.

mpm_winnt: remove duplication of ap_process_connection

Further follow-up to the previous commit: now that we no longer patch a
network bucket into the brigade, we can revert to calling
ap_process_connection() directly instead of duplicating its logic.

docs: rebuild
Submitted by: jchampion
Reviewed/backported by: jim

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

Merge r1758310 from trunk:

mpm_winnt: clear OVERLAPPED structs before reuse

MSDN documentation states that

    Any unused members of [an OVERLAPPED] structure should always be
    initialized to zero before the structure is used in a function call.
    Otherwise, the function may fail and return ERROR_INVALID_PARAMETER.

Prior to this patch, the internal state left over from previous
overlapped I/O was passed into the next call. It's unclear what effect
this might have, if any. (I have not personally witnessed an
ERROR_INVALID_PARAMETER myself.)
Submitted by: jchampion
Reviewed/backported by: jim

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

Merge r1756852, r1756853 from trunk:

Be more consistent when we alocate this brigade.
This should save a few bytes in case of early exit and is, IMHO, cleaner.

Fix some style (spaces only)
Submitted by: jailletc36
Reviewed/backported by: jim

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

Merge r1756846 from trunk:

Remove unused typedef uthn_dbd_conf
Submitted by: jailletc36
Reviewed/backported by: jim

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

vote/promote

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

update after backport

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

Merge of r1758083 from trunk:

mod_cgid: Resolve a case where a short CGI response causes a subsequent
     CGI to be killed prematurely, resulting in a truncated subsequent
     response.

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

vote and accept

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

Merge of r1758558 from trunk.

mod_proxy_http2: fix for netware build

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

Vote.

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

Some easy proposals

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

Merge r1758446 from trunk:

Without AP_DEBUG_ASSERT, these could still be NULL during runtime

Reviewed/backported by: jim

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

vote

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