sync 2.2 version of this doc with 2.4 and trunk version

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

rebuild doc

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

Fixes example to actually work.

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

rebuild doc

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

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

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

s/Freenode/Libera.chat/g

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

update transformation

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

Typo correction.

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

Close chapter, following 2.2.x example

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

documentation rebuild

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

docs: modify banner to inform users that 2.2 is no longer maintained

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

happy new year's documentation rebuild

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

Happy New Year 2018

Backport of r1820101 from trunk
resp. r1820103 from 2.4.x.

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

This was released - note no further releases expected

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

Clarify 2.2.33 that wasn't.

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

Add the CHANGES' security entry for 2.2.34.

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

Ensure docs follow suit

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

2.2.35-dev is most likely in our attic, but bump for disambiguation.

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

No longer dev, prepare to tag 2.2.34-final

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

Progress indicator

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

Fix negotiation type parsing to be strict about "*", "*/*" and "type/*"
comparisons.

Submitted by: wrowe, Robert Święcki <robert swiecki.net>
Backports: r1800917
Reviewed by: wrowe, jchampion, ylavic

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

Correct string scope to prevent duplicated values for subsequent tokens.

Submitted by: wrowe
Backports: r1800919
Reviewed by: wrowe, jchampion, ylavic

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

Vote, promote.

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

Vote.

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

Two more string parsing oddities for consideration

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

Restore single-char field names inadvertantly disallowed in 2.4.25.
Backports: r1800173
PR: 61220
Submitted by: ylavic
Reviewed by: wrowe, jchampion, ylavic

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

Vote, promote.

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

Actually this was a vote for 1800111, not the revised patch

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

Vote, promote.

Added 2.2.x convenience patch.

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

Propose Yann's alternative

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

* Vote

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

Proposed

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

And we are nominally at 2.2.34 although any further release is most unlikely

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

Prepare to tag 2.2.33

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

Make the range test legible; in the process, uncover and close
a bounds overflow condition. [wrowe]
Backports: r417252

Simplify and correctly range test lb_num. [jorton]
Discovered by Hisanobu Okuda
(No prior commit no)

Reviewed by: jorton, wrowe, ylavic

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

attribution

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

SECURITY: CVE-2017-7679 (cve.mitre.org)
mod_mime can read one byte past the end of a buffer when sending a
malicious Content-Type response header.

Merge r1797550 from trunk:
mod_mime: fix quoted pair scanning

Submitted By: ylavic

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

Merge https://svn.apache.org/r1796348 from trunk:

  *) SECURITY: CVE-2017-3167 (cve.mitre.org)
     Use of the ap_get_basic_auth_pw() by third-party modules outside of the
     authentication phase may lead to authentication requirements being
     bypassed.
     [Emmanuel Dreyfus <manu netbsd.org>, Jacob Champion, Eric Covener]

Submitted By: Emmanuel Dreyfus <manu netbsd.org>, Jacob Champion, Eric Covener
Reviewed By: covener, ylavic, wrowe

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

Merge https://svn.apache.org/r1796343  from trunk:

  *) SECURITY: CVE-2017-3169 (cve.mitre.org)
     mod_ssl may dereference a NULL pointer when third-party modules call
     ap_hook_process_connection() during an HTTP request to an HTTPS port.
     [Yann Ylavic]

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

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

SECURITY: CVE-2017-7668 (cve.mitre.org)
The HTTP strict parsing changes added in 2.2.32 and 2.4.24 introduced a
bug in token list parsing, which allows ap_find_token() to search past
the end of its input string. By maliciously crafting a sequence of
request headers, an attacker may be able to cause a segmentation fault,
or to force ap_find_token() to return an incorrect value.

Merge r1796350 from trunk:
short-circuit on NULL

Submitted By: jchampion
Reviewed By: jchampion, wrowe, ylavic

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

Looks good

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

Votes.

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

propose

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

propose ap_get-basic_auth_pw deprecation

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

Vote.

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

found my system problem

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

add proposal

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

Vote, promote.

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

Concur

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

Propose.

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

Remove 3DES by default for users of older crypto librarys; the cipher
has been reclassified in current OpenSSL releases as WEAK due to 112
or fewer bits of remaining cipher strength, while the Sweet32 disclosure
extended the criticism of RC4 on to 3DES. (IDEA, which potentially has the
same issue, is never enabled by default in OpenSSL, due to patent concerns.)

This commit does not change default httpd behavior, but alters the suggested
behavior of newly provisioned httpd servers. Where adopted, XP with IE8 will
no longer handshake with mod_ssl (previously, XP with IE6 would not handshake.)
The same net effect occurs where OpenSSL is updated to 1.1.0.

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

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