Merge r1493330, r1504276, r1552227, r1551714, r1490994, r1172732 from trunk:

Correct typo in error message

Unlikely potential memory leak.
Point 12 of PR 54936

Remove <Proxy ~ wildcard-url> syntax which:
   - is equivalent to <ProxyMatch wildcard-url>
   - has never been documented
   - incorrectly checks parameters (!cmd->path should be !cmd->path[0])
   - is buggy (! is missing in front of strncasecmp)

Avoid sending back uninitialized memory, use 'ftpmessage' in order to have something meaningful instead.

Save 8k of stack by the same time.

NULL terminate the right buffer

Fix issues found by PVS-Studio static analyzer:

mod_mime_magic:
cut'n'paste error rsl_encoding vs. rsl_separator, also simplify code a bit

mod_header:
wrong string initialization (leading to segfault if format argument is missing)

util_win32: duplicate sizeof (untested; Windows people, please review)

PR: 51542
Submitted by: Andrey Karpov <karpov viva64 com>, Stefan Fritsch

Reviewed by: jailletc36, rpluem, wrowe

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

Merge r1524192, r1524770, r1527925 from trunk:

Update rationale

draft-ietf-httpbis-p1-messaging-23 fixes regarding interactions
between TE and content-length in the same req/resp.

PR 55616 (add missing APLOGNO), part 1
Reviewed by: rpluem, ylavic, wrowe

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

* Remove mergeinfo from single files / directories. We track merging at the root.

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

Merge r1556428 from trunk:

SECURITY: CVE-2013-6438 (cve.mitre.org)
mod_dav: Keep track of length of cdata properly when removing leading spaces.

* modules/dav/main/util.c
  (dav_xml_get_cdata): reduce len variable when increasing cdata pointer.

Submitted by: Amin Tora <Amin.Tora neustar.biz>

Reviewed by: breser, rpluem, gstein, wrowe

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

SNI reuse checks backport proposal with MMN bump.

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

* Vote

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

* Promote

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

vote

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

Propose mod_proxy's SNI reuse checks to 2.2.x backport.

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

Vote for r1575400 backport.

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

With enough eyeballs, all bugs are shallow.  One more for your consideration.

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

Endorsements of all open 2.2 backport votes, anyone is welcome to commit these

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

vote for 'skip SNI check for forward proxy requests' proposal

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

update transformations.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1573281 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@1573280 13f79535-47bb-0310-9956-ffa450edef68

Merge r1534321, r1550061 from trunk:

* modules/proxy/mod_proxy_http.c (ap_proxy_http_request): Use the same
  brigade lifetime for the header brigade as the other brigades.
  POSSIBLE (but as yet unconfirmed) fix for crashes seen with threaded
  servers, e.g. PR 50335; appears correct or at least not harmful.

PR: 50335

Cleanup the bb brigade, because buckets inserted to it can be created from
scpool and this pool can be freed before this brigade.
POSSIBLE (but as yet unconfirmed) fix for crashes seen with threaded servers,
e.g. PR 50335.

Reviewed by: rpluem, jorton, ylavic

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

* Vote

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

Propose r1572543.

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

Votes + note on r1524770 discussion on dev@

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

* Vote

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

* Add proposal

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

Proposals

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

stabilize sort for latex build as well

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

handle duplicate directives by sorting directive lists additionally by module name

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

Yup

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

rebuild

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

Remove Netscape 4.x advice.

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

2.2.26 was announced  11/18/2013

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

update transformation

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

Update.

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

Updates.

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

update transformation

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

update German translation

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

update copyright.

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

update transformation

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

port style changes from trunk

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

rename zh-cn html files and update transformation

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

build bootstrap

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

add utf8 extension to zh-cn html files

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

fix tr docs charset

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

update transformation

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

update a few German translations

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

port latex/pdf changes from trunk

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

port prettify.css from trunk

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

update transformation

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

port style changes (and current prettify.js itself) from trunk

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

build bootstrap using new xalan

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

prepare for upcoming xalan update

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

msdn url change

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

build bootstrap

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

port retirement styles from 2.4

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

Drop stalled RFC 5878 backport proposals (reverted in trunk with r1468131),
as they have been obsoleted through "SSLOpenSSLConfCmd ServerInfoFile"
meanwhile (r1555683, and CT is no longer using SSL_CTX_use_authz_file either).

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

update transformation

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

resolve invalid references

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

update transformation

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

fix halting latex run

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

update transformation

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

apply style updates from 2.4

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

update transformation

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

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