Convinced, withdrawing my support for the lightly tested older backport

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

Read from top-to-bottom :)

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

Rebuild.

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

XML update.

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

lynx isn't common any more

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

Backported.

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

Merge r1710095, r1727544 from trunk:

core: Limit to ten the number of tolerated empty lines between request,
and consume them before the pipelining check to avoid possible response
delay when reading the next request without flushing.

Before this commit, the maximum number of empty lines was the same as
configured LimitRequestFields, defaulting to 100, which was way too much.
We now use a fixed/hard limit of 10 (DEFAULT_LIMIT_BLANK_LINES).

check_pipeline() is changed to check for (up to the limit) and comsume the
trailing [CR]LFs so that they won't be interpreted as pipelined requests,
otherwise we would block on the next read without flushing data, and hence
possibly delay pending response(s) until the next/real request comes in or
the keepalive timeout expires.

Finally, when the maximum number of empty line is reached in
read_request_line(), or that request line does not contains at least a method
and an (valid) URI, we can fail early and avoid some failure detected in
further processing.

* Ensure that proto_num and protocol is set in another "error out early" edge
  case. This can happen with invalid CONNECT requests as described in the PR.

PR: 58929

Submitted by: ylavic, rpluem
Reviewed  by: wrowe, covener, ylavic

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

Merge r892678, r1100511, r1102124 from trunk:

Reject requests containing (invalid) NULL characters in request line
or request headers.
PR 43039

use APR_STATUS_IS_TIMEUP() instead of direct comparison with APR_TIMEUP.

Use APR_STATUS_IS_... in some more cases.

While this is not strictly necessary everywhere, it makes it much easier
to find the problematic cases.

Submitted by: niq, covener, sf
Reviewed  by: wrowe, covener, ylavic

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

Vote, promote, plus another patching failure.

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

Vote, promote, but the second proposal does not apply cleanly...

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

emphasize that the flush in 2.2.x check_pipeline_flush() is actually
unconditional

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

Missed a digit, sorry

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

vote on protocol sync

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

The last proposed request handling backport to bring 2.2.x up to 2.4.x standards

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

Again, two more closely backports from 2.4.x for proper ErrorDocument behavior

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

Revert 1757391, sorry for the sloppy commit :-/

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

Two more closely backports from 2.4.x for proper ErrorDocument behavior

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

A scary patch which is not difficult to follow, been with us in 2.4.x all along

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

Collapsing a group of related backports organized backport proposal in the a.m.

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

Another comment-only backport syncing to 2.4.x, of trawick's r1057372

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

Another re-sync change (tweaked for absense of APLOG)

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

vote for protocl sync/prop from 2.4

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

The first of several 2.2 backports I'll offer to get protocol logic on 2.2
in sync with 2.4, allowing us to consider much more similar backport proposals
to both.

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

Backports: r1237407
Submitted by: trawick
s/ensure/insure/

Comment-only change, simply to ensure reviewers can review patches from trunk.

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

Normalization patch bringing 2.2.x branch closer to 2.4.x,
without functional changes.

Backports: r1213391, r1237407
Submitted by: rjung

zap an unhelpful, out of date comment from httpd 1.2
s/insure/ensure/

Backports: r1407004, r1407088, r1407528
Submitted by: sf

Remove unused code. "Next week" hasn't happened in the last 10 years or so.
remove some more old unused code
remove obsolete comment from 1.3 days

Backports: r1621419 (protocol.c only)
Submitted by: jailletc36

Fix sscanf format spotted by cppcheck
(changes version major/minor types from signed to unsigned)

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

Propose.

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

Committed in r1756565.

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

mod_mem_cache: Don't cache incomplete responses when the client
connection is aborted before the body is fully read.  PR 45049.

Backports: n/a (2.2.x only)
Submitted by: Nick Pace <nick simplylogic.net>, Edward Lu, Yann Ylavic
Reviewed by: ylavic, wrowe, rpluem

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

Merge r1753228 from trunk:

httpoxy workarounds, first draft patch as published for all 2.2.x+ sources

Submitted by: Dominic Scheirlinck <dominic vendhq.com>, ylavic
Reviewed by: wrowe, rpluem, ylavic

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

Typo.

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

ProxyRemote with TLS/CONNECT won't work w/o this fix.
The target/backend fails with:
    ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,
                 "Hostname %s provided via SNI and hostname %s provided"
                 " via HTTP are different", servername, host);
    (AH02032 in 2.4.x)

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

update transformation

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

build validate-xml

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

fix encoding in commit mails for spanish translations

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

Vote, promote, and propose.

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

* Vote and promote

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

Propose showstopper fix for httpoxy mitigation

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

Merge r1751930 from trunk:

mention mod_cgid too

http://httpd.apache.org/docs/2.4/howto/cgi.html#comment_5623

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

Backported.

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

mod_ssl: Free dhparams and ecparams reading certificates at startup.
This fixes issue when SSLCryptoDevice does not get unregistered because
of non-zero refcount during the mod_ssl unload happening on httpd startup.

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

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

Vote.

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

mod_mem_cache: Fix concurrent removal of stale entries which could lead
to a crash.

PR: 43724
Submitted by: ylavic
Reviewed by: covener, wrowe

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

vote... promote

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

mod_proxy: Fix a race condition that caused a failed worker to be retried
before the retry period is over

Backports: r1664709, r1697323
Submitted by: rpluem
Reviewed by: wrowe, ylavic

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

mod_proxy: save DNS lookups

Backports: r1462269, r1463455
Submitted by: rpluem
Reviewed by: wrowe, ylavic

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

mod_proxy: Give ap_proxy_post_request as chance to act correctly on the status
code by setting r->status temporarily to access_status. r->status might be
different than access_status e.g. r->status could be HTTP_OK if e.g. we
override the error page on the proxy or if the error was not generated by the
backend itself but by the proxy e.g. a bad gateway.

Backports: r1597352
Submitted by: rpluem
Reviewed by: wrowe, ylavic

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

mime.types: Add common extension "m4a" for MPEG 4 Audio.
As a reference see Wikipedia:
https://en.wikipedia.org/wiki/MPEG-4_Part_14#.MP4_versus_.M4A

Submitted by: Dylan Millikin <dylan.millikin gmail.com>
PR: 57895
Backports: r1723567
Reviewed by: rjung, wrowe, ylavic

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

mod_proxy: don't recyle backend announced "Connection: close" connections
to avoid reusing it should the close be effective after some new request
is ready to be sent.

Backports: r1678763, r1703807, r1703813, r1678763
Submitted by: ylavic
Reviewed by: rpluem, wrowe

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

mod_substitute: Allow to configure the patterns merge order with the new
SubstituteInheritBefore on|off directive (with default in 2.2 of 'off)

Backports: r1684900, r1687539, r1687680, r1688331, r1688339, r1688340, r1688343,
           r1697013, r1697015
PR: 57641
Submitted by:
     [Marc.Stern <Marc.Stern approach.be>, Yann Ylavic, William Rowe]

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

More bugfixes required.

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

vote for memcache crash fix

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

Add CHANGES entry in mod_mem_cache patch relating to PR 45049.
While at it, propose another fix for mod_mem_cache relating to PR 43724.

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

Votes + promotes, and clarify suggested patch improvements

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

update transformation

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

Clarify note from r1750226.

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

Note that more backports are needed after r1723567.

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

Fix people->home links, propose new mem_cache_client_abort fix, vote and promote.

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

Upvotes, note missing patches

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

abs: Include OPENSSL_Applink when compiling on Windows, to resolve
failures under Visual Studio 2015 and other mismatched MSVCRT flavors.

PR: 59630
Submitted by: Jan Ehrhardt <phpdev ehrhardt.nl>

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

Looks like a docs/ change to me

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

Expand on fix - jkaluza will likely concur

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

Note, and upvote

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

Upvote, but as a docs issue, not really requiring a vote

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

Propose a long-ignored backport with a long list of contributors

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

RE: bz 59316 - remove reference to mod_jserv

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

update transformation

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

Rebuild.

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

XML update.

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

Rebuild.

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

XML update.

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

Rebuild.

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

XML update.

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

Documentation rebuild.

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

Added retirement banner to all the documentation pages to suggest the migration to 2.4

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

Documentation rebuild

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

Backported Doc change for sections.html, moved example sections to highligh.

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

Rebuild.

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

XML updates.

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

Documentation rebuild.

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

Added a specific reference of evaluation order between ProxyPass and RewriteRule directives. Bug: 54158

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

Documentation rebuilt for previous commit.

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

Change backported from trunk: Adding more details about environment variables passed to cgi scripts.

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

Fix typo in comment (s/patterm/pattern/).

Backport of r1726086 from trunk
resp. r1726087 from 2.4.x.

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

xforms

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

Fix spurious char

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

XML update, see PR58868

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

xforms

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

Fix typo

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

xforms

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

Remove references to the END flag, which is not in this release.
PR58868

Submitted By: Daniel Frederick Crisman asf-bugzilla sutoa.org
Committed By: covener

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

XML header update.

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

XML update.

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

Propose.

Although mime.types as part of conf is underneath
"docs", it is probably safer to vote on it and not
rely on CTR for documentation.

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

Update XForms.

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

Happy New Year 2016

Backport of r1722572 from trunk
resp. r1722573 from 2.4.x.

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

Propose r1720129

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

Rebuild

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

Fix typo

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

Note that 2.2.1, 2.2.28 were not released.

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

Rebuild.

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