update transformation

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

* server/core.c (merge_core_server_configs): Fix merging of
  HttpProtocolOptions from global to vhost context.

Reviewed by: jorton, wrowe, covener

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

note 2.2.32 release in STATUS

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

XML update.

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

As per http://httpd.apache.org/docs/2.4/programs/httpd.html#comment_6187
the -R option has been gone for ages.

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

Rebuild.

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

XML update.

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

Rebuild.

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

XML update.

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

And we are at 2.2.33-dev

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

Prepare to tag 2.2.32

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

Add warning, as suggested on dev@; rinse and repeat for Announcement

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

** NOTE: the vendor states "This mitigation has been assigned the identifier
CVE-2016-5387"; in other words, this is not a CVE ID for a vulnerability. **

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

update transformation

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

Regenerated all docs for release

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

http: allow folding in check_headers(), still compliant with RFC 7230 (3.2.4).
Backports: r1777460, r1777672
Submitted by: ylavic
Reviewed by: ylavic, covener, wrowe

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

Reviewed and approved, because 2.2.x is not likely to have another bugfix
release beyond security fixes.

For the same reason, demote months-old proposal to stalled, as this is not
likely to gain another reviewer.

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

Rebuild.

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

XML updates.

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

Comment.

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

Backported.

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

Merge r1634120 from trunk:

* Use the correct server name for SNI in case the backend SSL connection itself
  is established via a proxy server.

PR: 57139
Submitted by: Szabolcs Gyurko <szabolcs gyurko.org>

Committed by: rpluem
Backported by: ylavic
Reviewed by: ylavic, wrowe, covener, orlikowski

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

Merge r1729826, r1729847, r1732986, r1733056 from trunk:

mod_proxy: Play/restore the TLS-SNI on new backend connections which
had to be issued because the remote closed the previous/reusable one
during idle (keep-alive) time.

mod_proxy: follow up to r1729826: really copy conn->ssl_hostname.

mod_proxy: follow up to r1729826 + r1729847.
Adjust stacked ssl_hostname maximum size.

mod_proxy: follow up to r1729826 + r1729847 + r1732986.
Don't use magic constants.

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

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

Merge r1753592 from trunk:

* Do not overwrite r->status with access_status if access_status is OK or DONE
  as in this case r->status might contain the true response code.

PR: 59869

Submitted by: rpluem
Reviewed/backported by: ylavic, wrowe, covener, orlikowski

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

dev@ votes noted

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

vote/promote

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

Required to build on Windows and NetWare, plus the actual fix...

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

Update.

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

minor issue with folding patch

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

Update, per dev@ review.

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

Clarify why a backport patch is needed.

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

Propose, just in case...

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

checked in

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

Support compilation against libssl built with OPENSSL_NO_SSL3.

backport https://svn.apache.org/r1706008 from 2.4.x

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

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

Merge r1635970 from 2.4.x:

Merge r1633031, r1633522, r1633529, r1633530 from trunk

Style fix

Submitted by: jailletc36
Reviewed by: jailletc36, jim, ylavic
Backported by: jailletc36

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

Fix trivial compiler warnings

2.2.x patch: http://home.apache.org/~ylavic/patches/httpd-2.2.x-fix_trivial_warnings.patch

Reviewed by: ylavic, covener, wrowe

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

vote/promote

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

promo

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

In the process of reviewing all patches proposed, but looking correct so far

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

Promote r1753592 as showstopper, since it also fixes build with MSVC.
(Not worth fixing the build if we can backport this change, two fixes for the price of one :)

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

committed

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

backport HTTP strict processing from 2.4.x.

This backport is hand-constructed from many commits of HTTP strict,
subsequent fixes, as well as dependencies that hadn't been backported
to 2.2.x.

The bulk is merged from httpd-2.4.x-merge-http-strict branch r1767941 - r1775671
Further details on httpd-2.2.x-merge-http-strict

Submitted By: sf, wrowe
Reviewed By: covener, ylavic, wrowe

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

done

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

backport r1125877 from trunk

Fix various "variable 'x' set but not used" warnings.

Submitted By: sf
Reviewed By: ylavic, wrowe, covener

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

backported

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

Merge r1542549 from 2.4.x:

Potential rejection of valid MaxMemFree and ThreadStackSize directives

trunk patch: https://svn.apache.org/r1542338

Submitted by: Mike Rumph <mike.rumph oracle.com>
Reviewed by: trawick, covener, sf

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

backported

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

Merge r752546 from trunk:

the CRLF following 100 Continue needs to be sent as ASCII on EBCDIC
boxes.

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

vote/promote

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

Propose fix for clever gcc warning.

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

Propose fix for remaining warnings.

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

Propose: openssl < 1.0.2 are EOL, and SSLv3 is disabled by default on active versions.

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

Two down...

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

Propose.

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

whoops

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

Votes.

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

Vote, promote.

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

ebcdic fix missing from 2.2

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

drop trivia about patch

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

Couldn't find the net discrepancy

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

record vote for showstopper

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

addressed on 2.2.x-merge-http-strict

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

add a few comments on current rev

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

Fix a typo spotted in an old comment

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

Update Xforms.

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

I think we need to set retirement here.
Otherwise a full rebuild resets the retirement
info in manual/style/manual.LANGUAGE.xsl.

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

Use the same retirement info for korean docs
as for all others.

Followup to r1732029.

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

Happy New Year 2017

Backport of r1776956 from trunk resp.
r1776957 from 2.4.x.

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

This was my entire intended commit. But as an alternate strategy, you can
svn up to r1775787. Not that I intended it, and absolutely not the way we
should apply it (revert layer by layer 6 commits replicated on the merge
branch, then apply merge branch in one commit, IMO.)

Sorry folks ;-/

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

I really just did that on my test-merge branch??? fueque... reverting r1775787

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

Resigning my first attempt to get patches through the 2.2.x process, and
revoking my ratification of a list of patches (e.g. -1 as had been applied,
including my own submissions - I will revert in any case, where misordered.)

Proposing that we start with the same branch model as used on 2.4.x to get
through too many many-year-old patches to idly browse through; replay these
in mostly-sequential order, and bring 2.2.x up to 2.4.x in the affected areas
of code, and finally this proposal suggests the same merge as was applied to
2.4.25 GA release, modulo all our new crazy APLOGNO fun.

There is not much to see here, other than to compare rev no's of what had
been applied/proposed reverts to the list of patches on the 2.2.x merge
branch... the interesting data is on that merge branch. But extensive testing
against the resulting code is critical to our hope of offering a last 2.2.x
release to close that chapter. TIA to each and everyone who assists!

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

Merge r892808 from trunk:

Fix up r892678 as pointed out by rpluem.

Submitted by: niq
Reviewed by: covener, jchampion, ylavic

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

Vote, promote.

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

Vote

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

missing revision in old backport

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

update transformation

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

Generated doc changes

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

Change 2.2 installation doc to recommend a minimum APR version of 1.4

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

update transformation

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

update revision (only bom changed)

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

use consistent encoding between xml.fr files (utf-8)

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

remove BOM

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

update transformation

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

Propose a change to core.

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

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