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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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