Updates.

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

Merge r1517406 from trunk:

PR55352: mention in the <Proxy> manual that the matching is a prefix only, not
the same context-root / segment-aware matching done by <Location>.

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

move to proper section

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

Add mod_rewrite.h to the headers installed on Windows.

Submitted By: Bob Ionescu
Committed By: covener

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

Typo.

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

Updates.

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

vote/approve for a mod_dav patch backport

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

Rebuild

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

Links to third-party binaries, since we don't do that much any more.

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

Fix typo (PR 55709)

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

add compat info for env=!envvar

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

note when env=!foo was added

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

Updates.

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

* Vote

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

xform

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

balance out the key=value ... brackets, as in 2.4 and later

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

* STATUS: Nominate r1556428 for backport to 2.2.x

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

xform

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

missing newlines in example

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

xforms

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

Merge r1554276, r1554281, r1555555 from trunk:

    digest auth is only marginally more secure than basic auth.
    Adjust the docs to today's reality.

    mention insecure password storage as pointed out by Graham

    axe one more case of digest auth being described as secure

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

Update.

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

Merge r1555116 from trunk:

emphasize that this is mostly just AAA checks and not the status
code of the handler. PR21828 and various dups.

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

s/2013/2014/

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

update transformation

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

Vote.

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

Typo

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

* Add proposal

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

Update.

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

Update.

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

fix XML validation error on r1546536

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

Merge r1546534 from trunk:

compat note for AuthLDAPBindPassword exec:

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

update transformations.

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

update for sync with English docs.

Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by:  Orhan Berent <berent belgeler.gen.tr>

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

Updates.

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

And roll on 2.2.27-dev

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

Get ready to tag HEAD as 2.2.26

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

One concern in accepting this proposal

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

Propose CL/TE fixes

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

r954641: Fix some compiler warnings:

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

Merge r1529559, r1531505 from trunk:

Fix PR 55397: dav_resource->uri treated as an unparsed uri.

The change made for PR 54611 caused this field to be treated as
unescaped.  mod_dav_svn however, provided escaped URIs.  Essentially
breaking support for paths with non-URI safe characters in SVN.

Adjust the code so that dav_resource->uri is assumed to be escaped and
adjust mod_dav_fs so that it uses escaped URIs in this field.

* modules/dav/fs/repos.c
  (dav_fs_get_resource): Use the unparsed_uri to contruct the resource uri.

* modules/dav/main/mod_dav.c
  (dav_xml_escape_uri): Do not uri escape, just handle xml escaping.
  (dav_created): Assume that locn if provided is escaped.
  (dav_method_copymove, dav_method_bind): Use the unparsed_uri on the request
    when calling dav_created() to adjust to locn assuming it is escaped.

* modules/dav/main/mod_dav.h
  (dav_resource): Document that uri is escaped.

Followup to r1529559: mod_dav_fs: Fix encoding of hrefs in PROPFIND response.

Previous commit missed encoding the names of the children of the PROPFIND
request when the depth wasn't 0.

* modules/dav/fs/repos.c
  (dav_fs_append_uri): New function
  (dav_fs_walker): Use dav_fs_append_uri() and adjust length calculations to
    use the encoded length.

Submitted by: breser
Reviewed/backported by: jim

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

Merge r1528718 from trunk:

mod_dav: Fix PR 55306.

Makes mod_dav no longer require that the lock token be provided when the
source of a COPY is locked.  The prior behavior was in violating of
RFC 4918 which says that the lock token is only required on resources
that may be modified by the method.

* modules/dav/main/mod_dav.h
  (DAV_VALIDATE_NO_MODIFY): New flag to be passed to dav_validate_* functions.

* modules/dav/main/mod_dav.c
  (dav_method_copymove): Use the new flag when calling dav_validate_request()
    on the COPY source.

* modules/dav/main/util.c
  (dav_validate_resource_state): Use the flag to decide to ignore if the lock
    token is not provided.

Submitted by: breser
Reviewed/backported by: jim

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

Merge r834378, r835046, r1040304, r1040373, r1090645, r1294306, r1509872, r1308862, r1509875 from trunk:

enable support for ECC keys and ECDH ciphers.  Tested against
OpenSSL 1.0.0b3.  [Vipul Gupta vipul.gupta sun.com, Sander Temme]

* Use correct #ifndef's to compile again on openssl 0.9.8 and fix compiler
  warnings.

Noted by: sf

Removed unused var.

Stop warning, init should be an int.

Remove unused variable

Initialize EC temporary key on server startup, as for DH and
RSA. This fixes a race condition that could lead to a crash with threaded
MPMs.

Mention ECC support

Submitted by: sctemme, rpluem, fuankg, drh, sf, sf, sf, jim, sf
Reviewed/backported by: jim

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

Note T&R (possible) this week

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

  All proposed patch sets look smart, all but one cure regressions,
  and ECC support seems overdue and looks minimalistic/clean.

  Voted and all promoted.

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

It works better when one test's the correct patch.

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

update transformation

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

Update.

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

Remove erroneous space reported in pr55676

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

generated from "make docs"

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

Merge r1532816 from trunk:

Interpolation worked within the scheme portion of URLs for
ProxyPass and ProxyPassReverse until a fix to apr_uri_parse()
in APR-Util 1.5.2 closed the hole that had previously allowed
the necessary {} characters within the scheme.

Lack of support for interpolation within the scheme will be a
permanent limitation.

The mod_proxy documentation is updated to provide an alternate
configuration solution.

PR: 55315
Submitted by: Mike Rumph <mike.rumph oracle.com>
Tweaked by: trawick

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

Vote, comment.

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

* STATUS: Nominate PR 55397 for 2.2.x

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

Propose fix for PR 55306.

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

Add missing space

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

update transformation

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

#55441 fix - document that SetEnv cannot set PATH in 2.2

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

2*done, 1*vote.

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

Merge 1506714 from trunk:

Fix bug #55304 with the provided patch, slightly reformatted.

In short: do not validate conditions of a COPY source's parent since
it is not modified during the operation.

* modules/dav/main/mod_dav.c:
  (dav_method_copymove): adjust params to dav_validate_request()

PR: 55304
Submitted by: breser
Reviewed by: gstein, wrowe, rpluem

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

Merge 1082189 from trunk:

* modules/ssl/ssl_engine_kernel.c (ssl_hook_ReadReq): Compare SNI
  hostname against Host header case-insensitively.

PR: 49491
Submitted by: Mayank Agrawal <magrawal.08 gmail.com>
Reviewed by: rpluem, trawick, covener

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

merge covener and rpluem proposals for r1082190, vote for improved ECC patch

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

revert unintentional commit r1515537

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

2 votes in one proposal for 1082189 and 1 vote in another = approval

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

propose SNI fix for 2.2.x

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

update transformations.

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

update for sync with English docs.

Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by:  Orhan Berent <berent belgeler.gen.tr>

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

update patch, reply

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

complain^H^H^H^H^H^H^Hask humbly about a missing feature in the ECC proposal

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

update transformation

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

fix mod_ssl config buglet

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

fix a few indentation oddities which are already resolved in 2.4.x

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

Merge r1485409:

  Be more clever when allocating memory for log item to be escaped.
  This should be faster and save about 70-100 bytes in the request pool with the default config.

Reviewed by: minfrin, rjung, rpluem

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

Merge r1400700:

    Change default for SSLCompression to off, as compression
    causes security issues in most setups

Reviewed by sf, fuankg, rjung

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

The first release with SSLProxyMachineCertificateChainFile was 2.2.23, not 2.2.22.

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

propose

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

Update.

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

xforms

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

Merge r1507326 from trunk:

add a note that proxy environment variables are either set or unset,
unless specific values are listed.

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

Merge r1507320 from trunk:

1-arg SetEnv is valid

http://httpd.apache.org/docs/2.2/mod/mod_proxy_http.html#comment_1528

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

vote (hostnames are case-insignificant)

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

* Promote

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

* Vote

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

* Add proposal

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

Concur

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

propose r1506714 for backport

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

Updates.

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

Done

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

correct year

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

Updated fix for issue which was initially addressed in r1500108:

mod_ssl: Fix "SNI for backend" when compiled against
OpenSSL without support for SSLv2.

PR 55194.

Followup to r1497466. Does not apply to trunk or 2.4.x.

Proposed by: kbrand
Reviewed by: wrowe, rpluem

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

Revert r1500108 (as discussed on dev@, to be updated
with the next commit):

mod_ssl: Fix "SNI for backend" when compiled against
OpenSSL without support for SSLv2.

PR 55194.

Followup to r1497466. Does not apply to trunk or 2.4.x.

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

Note security implication

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

Vote, promote.

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

Typo

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

xforms

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

Merge r1500323 (add note when default algorithm has been changed) and add
warning about crypt alogrithm from 2.4 man page

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

Updates.

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

Vote.

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

Applied.

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

Avoid including apr_general.h.
The MSVC Resource Compiler truncates macro names at char 31.
Since apr_general.h includes apr.h which in turn includes
system headers we get warnings or errors with the Resource
Compiler with newer system headers (VC10 and later) which
have macro names defined with more than 31 chars.
(backport from trunk r1499742 / httpd-2.4.x r1499855)
Reviewed by: gsmith, sf

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

vote, promote, propose

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