]> git.ipfire.org Git - thirdparty/apache/httpd.git/log
thirdparty/apache/httpd.git
8 years agodone
Eric Covener [Thu, 5 Jan 2017 01:36:38 +0000 (01:36 +0000)] 
done

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

8 years agobackport r1125877 from trunk
Eric Covener [Thu, 5 Jan 2017 01:35:36 +0000 (01:35 +0000)] 
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

8 years agobackported
Eric Covener [Thu, 5 Jan 2017 01:34:40 +0000 (01:34 +0000)] 
backported

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

8 years agoMerge r1542549 from 2.4.x:
Eric Covener [Thu, 5 Jan 2017 01:34:27 +0000 (01:34 +0000)] 
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

8 years agobackported
Eric Covener [Thu, 5 Jan 2017 01:30:56 +0000 (01:30 +0000)] 
backported

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

8 years agoMerge r752546 from trunk:
Eric Covener [Thu, 5 Jan 2017 01:30:45 +0000 (01:30 +0000)] 
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

8 years agovote/promote
Eric Covener [Thu, 5 Jan 2017 01:28:09 +0000 (01:28 +0000)] 
vote/promote

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

8 years agoPropose fix for clever gcc warning.
Yann Ylavic [Thu, 5 Jan 2017 01:19:46 +0000 (01:19 +0000)] 
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

8 years agoPropose fix for remaining warnings.
Yann Ylavic [Thu, 5 Jan 2017 01:10:16 +0000 (01:10 +0000)] 
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

8 years agoPropose: openssl < 1.0.2 are EOL, and SSLv3 is disabled by default on active versions.
Yann Ylavic [Thu, 5 Jan 2017 00:35:09 +0000 (00:35 +0000)] 
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

8 years agoTwo down...
William A. Rowe Jr [Thu, 5 Jan 2017 00:05:16 +0000 (00:05 +0000)] 
Two down...

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

8 years agoPropose.
Yann Ylavic [Wed, 4 Jan 2017 23:41:54 +0000 (23:41 +0000)] 
Propose.

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

8 years agowhoops
Eric Covener [Wed, 4 Jan 2017 23:19:22 +0000 (23:19 +0000)] 
whoops

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

8 years agoVotes.
Yann Ylavic [Wed, 4 Jan 2017 23:07:03 +0000 (23:07 +0000)] 
Votes.

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

8 years agoVote, promote.
Yann Ylavic [Wed, 4 Jan 2017 22:24:06 +0000 (22:24 +0000)] 
Vote, promote.

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

8 years agoebcdic fix missing from 2.2
Eric Covener [Wed, 4 Jan 2017 15:56:02 +0000 (15:56 +0000)] 
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

8 years agodrop trivia about patch
Eric Covener [Wed, 4 Jan 2017 03:23:57 +0000 (03:23 +0000)] 
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

8 years agoCouldn't find the net discrepancy
William A. Rowe Jr [Wed, 4 Jan 2017 02:38:38 +0000 (02:38 +0000)] 
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

8 years agorecord vote for showstopper
Eric Covener [Tue, 3 Jan 2017 21:40:28 +0000 (21:40 +0000)] 
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

8 years agoaddressed on 2.2.x-merge-http-strict
Eric Covener [Tue, 3 Jan 2017 17:51:34 +0000 (17:51 +0000)] 
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

8 years agoadd a few comments on current rev
Eric Covener [Tue, 3 Jan 2017 16:13:21 +0000 (16:13 +0000)] 
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

8 years agoFix a typo spotted in an old comment
Christophe Jaillet [Tue, 3 Jan 2017 04:29:03 +0000 (04:29 +0000)] 
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

8 years agoUpdate Xforms.
Rainer Jung [Mon, 2 Jan 2017 19:36:48 +0000 (19:36 +0000)] 
Update Xforms.

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

8 years agoI think we need to set retirement here.
Rainer Jung [Mon, 2 Jan 2017 19:18:33 +0000 (19:18 +0000)] 
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

8 years agoUse the same retirement info for korean docs
Rainer Jung [Mon, 2 Jan 2017 19:12:15 +0000 (19:12 +0000)] 
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

8 years agoHappy New Year 2017
Rainer Jung [Mon, 2 Jan 2017 16:16:17 +0000 (16:16 +0000)] 
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

8 years agoThis was my entire intended commit. But as an alternate strategy, you can
William A. Rowe Jr [Fri, 23 Dec 2016 05:24:54 +0000 (05:24 +0000)] 
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

8 years agoI really just did that on my test-merge branch??? fueque... reverting r1775787
William A. Rowe Jr [Fri, 23 Dec 2016 05:22:13 +0000 (05:22 +0000)] 
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

8 years agoResigning my first attempt to get patches through the 2.2.x process, and
William A. Rowe Jr [Fri, 23 Dec 2016 05:19:21 +0000 (05:19 +0000)] 
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

8 years agoMerge r892808 from trunk:
Ruediger Pluem [Tue, 20 Dec 2016 08:59:06 +0000 (08:59 +0000)] 
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

8 years agoVote, promote.
Yann Ylavic [Wed, 7 Dec 2016 13:56:33 +0000 (13:56 +0000)] 
Vote, promote.

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

8 years agoVote
Jacob Champion [Tue, 6 Dec 2016 20:44:06 +0000 (20:44 +0000)] 
Vote

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

8 years agomissing revision in old backport
Eric Covener [Tue, 6 Dec 2016 18:55:08 +0000 (18:55 +0000)] 
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

8 years agoupdate transformation
André Malo [Sat, 3 Dec 2016 19:37:07 +0000 (19:37 +0000)] 
update transformation

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

8 years agoGenerated doc changes
Mike Rumph [Thu, 1 Dec 2016 15:56:18 +0000 (15:56 +0000)] 
Generated doc changes

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

8 years agoChange 2.2 installation doc to recommend a minimum APR version of 1.4
Mike Rumph [Thu, 1 Dec 2016 15:52:35 +0000 (15:52 +0000)] 
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

8 years agoupdate transformation
André Malo [Sun, 27 Nov 2016 22:39:12 +0000 (22:39 +0000)] 
update transformation

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

8 years agoupdate revision (only bom changed)
André Malo [Sun, 27 Nov 2016 22:37:00 +0000 (22:37 +0000)] 
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

8 years agouse consistent encoding between xml.fr files (utf-8)
André Malo [Sun, 27 Nov 2016 22:31:33 +0000 (22:31 +0000)] 
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

8 years agoremove BOM
André Malo [Sun, 27 Nov 2016 22:25:46 +0000 (22:25 +0000)] 
remove BOM

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

8 years agoupdate transformation
André Malo [Thu, 20 Oct 2016 08:44:06 +0000 (08:44 +0000)] 
update transformation

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

8 years agoPropose a change to core.
Mike Rumph [Wed, 5 Oct 2016 17:16:33 +0000 (17:16 +0000)] 
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

8 years agoConvinced, withdrawing my support for the lightly tested older backport
William A. Rowe Jr [Thu, 29 Sep 2016 14:35:27 +0000 (14:35 +0000)] 
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

8 years agoRead from top-to-bottom :)
William A. Rowe Jr [Wed, 28 Sep 2016 15:31:41 +0000 (15:31 +0000)] 
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

8 years agoRebuild.
Lucien Gentis [Sat, 17 Sep 2016 13:24:41 +0000 (13:24 +0000)] 
Rebuild.

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

8 years agoXML update.
Lucien Gentis [Sat, 17 Sep 2016 13:23:36 +0000 (13:23 +0000)] 
XML update.

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

8 years agolynx isn't common any more
Rich Bowen [Tue, 13 Sep 2016 14:06:05 +0000 (14:06 +0000)] 
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

8 years agoBackported.
Yann Ylavic [Wed, 31 Aug 2016 19:52:52 +0000 (19:52 +0000)] 
Backported.

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

8 years agoMerge r1710095, r1727544 from trunk:
Yann Ylavic [Wed, 31 Aug 2016 19:52:28 +0000 (19:52 +0000)] 
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

8 years agoMerge r892678, r1100511, r1102124 from trunk:
Yann Ylavic [Wed, 31 Aug 2016 19:49:25 +0000 (19:49 +0000)] 
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

8 years agoVote, promote, plus another patching failure.
Yann Ylavic [Wed, 31 Aug 2016 19:39:02 +0000 (19:39 +0000)] 
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

8 years agoVote, promote, but the second proposal does not apply cleanly...
Yann Ylavic [Wed, 31 Aug 2016 19:28:36 +0000 (19:28 +0000)] 
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

8 years agoemphasize that the flush in 2.2.x check_pipeline_flush() is actually
Eric Covener [Sat, 27 Aug 2016 21:08:08 +0000 (21:08 +0000)] 
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

8 years agoMissed a digit, sorry
William A. Rowe Jr [Thu, 25 Aug 2016 14:58:22 +0000 (14:58 +0000)] 
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

8 years agovote on protocol sync
Eric Covener [Thu, 25 Aug 2016 12:41:55 +0000 (12:41 +0000)] 
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

8 years agoThe last proposed request handling backport to bring 2.2.x up to 2.4.x standards
William A. Rowe Jr [Tue, 23 Aug 2016 16:57:50 +0000 (16:57 +0000)] 
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

8 years agoAgain, two more closely backports from 2.4.x for proper ErrorDocument behavior
William A. Rowe Jr [Tue, 23 Aug 2016 15:49:28 +0000 (15:49 +0000)] 
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

8 years agoRevert 1757391, sorry for the sloppy commit :-/
William A. Rowe Jr [Tue, 23 Aug 2016 15:47:34 +0000 (15:47 +0000)] 
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

8 years agoTwo more closely backports from 2.4.x for proper ErrorDocument behavior
William A. Rowe Jr [Tue, 23 Aug 2016 15:44:12 +0000 (15:44 +0000)] 
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@1757391 13f79535-47bb-0310-9956-ffa450edef68

8 years agoA scary patch which is not difficult to follow, been with us in 2.4.x all along
William A. Rowe Jr [Tue, 23 Aug 2016 14:00:00 +0000 (14:00 +0000)] 
A scary patch which is not difficult to follow, been with us in 2.4.x all along

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

8 years agoCollapsing a group of related backports organized backport proposal in the a.m.
William A. Rowe Jr [Tue, 23 Aug 2016 05:59:58 +0000 (05:59 +0000)] 
Collapsing a group of related backports organized backport proposal in the a.m.

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

8 years agoAnother comment-only backport syncing to 2.4.x, of trawick's r1057372
William A. Rowe Jr [Tue, 23 Aug 2016 01:35:23 +0000 (01:35 +0000)] 
Another comment-only backport syncing to 2.4.x, of trawick's r1057372

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

8 years agoAnother re-sync change (tweaked for absense of APLOG)
William A. Rowe Jr [Mon, 22 Aug 2016 22:58:52 +0000 (22:58 +0000)] 
Another re-sync change (tweaked for absense of APLOG)

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

8 years agovote for protocl sync/prop from 2.4
Eric Covener [Mon, 22 Aug 2016 20:46:49 +0000 (20:46 +0000)] 
vote for protocl sync/prop from 2.4

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

8 years agoThe first of several 2.2 backports I'll offer to get protocol logic on 2.2
William A. Rowe Jr [Mon, 22 Aug 2016 20:45:05 +0000 (20:45 +0000)] 
The first of several 2.2 backports I'll offer to get protocol logic on 2.2
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

8 years agoBackports: r1237407
William A. Rowe Jr [Mon, 22 Aug 2016 19:29:46 +0000 (19:29 +0000)] 
Backports: r1237407
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

8 years agoNormalization patch bringing 2.2.x branch closer to 2.4.x,
William A. Rowe Jr [Mon, 22 Aug 2016 18:36:29 +0000 (18:36 +0000)] 
Normalization patch bringing 2.2.x branch closer to 2.4.x,
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

8 years agoPropose.
Yann Ylavic [Wed, 17 Aug 2016 00:10:32 +0000 (00:10 +0000)] 
Propose.

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

8 years agoCommitted in r1756565.
Yann Ylavic [Tue, 16 Aug 2016 23:37:46 +0000 (23:37 +0000)] 
Committed in r1756565.

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

8 years agomod_mem_cache: Don't cache incomplete responses when the client
Yann Ylavic [Tue, 16 Aug 2016 23:36:51 +0000 (23:36 +0000)] 
mod_mem_cache: Don't cache incomplete responses when the client
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

8 years agoMerge r1753228 from trunk:
Yann Ylavic [Tue, 16 Aug 2016 23:32:35 +0000 (23:32 +0000)] 
Merge r1753228 from trunk:

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

8 years agoTypo.
Yann Ylavic [Thu, 11 Aug 2016 11:15:28 +0000 (11:15 +0000)] 
Typo.

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

8 years agoProxyRemote with TLS/CONNECT won't work w/o this fix.
Yann Ylavic [Thu, 11 Aug 2016 11:13:56 +0000 (11:13 +0000)] 
ProxyRemote with TLS/CONNECT won't work w/o this fix.
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

9 years agoupdate transformation
André Malo [Thu, 28 Jul 2016 09:55:35 +0000 (09:55 +0000)] 
update transformation

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

9 years agobuild validate-xml
André Malo [Thu, 28 Jul 2016 09:34:58 +0000 (09:34 +0000)] 
build validate-xml

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

9 years agofix encoding in commit mails for spanish translations
André Malo [Thu, 28 Jul 2016 09:24:40 +0000 (09:24 +0000)] 
fix encoding in commit mails for spanish translations

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

9 years agoVote, promote, and propose.
Yann Ylavic [Wed, 27 Jul 2016 13:16:07 +0000 (13:16 +0000)] 
Vote, promote, and propose.

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

9 years ago* Vote and promote
Ruediger Pluem [Tue, 26 Jul 2016 18:28:01 +0000 (18:28 +0000)] 
* Vote and promote

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

9 years agoPropose showstopper fix for httpoxy mitigation
William A. Rowe Jr [Tue, 26 Jul 2016 16:50:18 +0000 (16:50 +0000)] 
Propose showstopper fix for httpoxy mitigation

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

9 years agoMerge r1751930 from trunk:
Eric Covener [Fri, 8 Jul 2016 16:00:50 +0000 (16:00 +0000)] 
Merge r1751930 from trunk:

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

9 years agoBackported.
Joe Orton [Thu, 7 Jul 2016 15:51:59 +0000 (15:51 +0000)] 
Backported.

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

9 years agomod_ssl: Free dhparams and ecparams reading certificates at startup.
Joe Orton [Thu, 7 Jul 2016 15:51:40 +0000 (15:51 +0000)] 
mod_ssl: Free dhparams and ecparams reading certificates at startup.
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

9 years agoVote.
Joe Orton [Thu, 7 Jul 2016 15:49:53 +0000 (15:49 +0000)] 
Vote.

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

9 years agomod_mem_cache: Fix concurrent removal of stale entries which could lead
William A. Rowe Jr [Thu, 30 Jun 2016 17:47:48 +0000 (17:47 +0000)] 
mod_mem_cache: Fix concurrent removal of stale entries which could lead
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

9 years agovote... promote
William A. Rowe Jr [Thu, 30 Jun 2016 17:46:21 +0000 (17:46 +0000)] 
vote... promote

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

9 years agomod_proxy: Fix a race condition that caused a failed worker to be retried
William A. Rowe Jr [Thu, 30 Jun 2016 17:44:28 +0000 (17:44 +0000)] 
mod_proxy: Fix a race condition that caused a failed worker to be retried
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

9 years agomod_proxy: save DNS lookups
William A. Rowe Jr [Thu, 30 Jun 2016 17:29:41 +0000 (17:29 +0000)] 
mod_proxy: save DNS lookups

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

9 years agomod_proxy: Give ap_proxy_post_request as chance to act correctly on the status
William A. Rowe Jr [Thu, 30 Jun 2016 17:14:18 +0000 (17:14 +0000)] 
mod_proxy: Give ap_proxy_post_request as chance to act correctly on the status
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

9 years agomime.types: Add common extension "m4a" for MPEG 4 Audio.
William A. Rowe Jr [Thu, 30 Jun 2016 17:10:32 +0000 (17:10 +0000)] 
mime.types: Add common extension "m4a" for MPEG 4 Audio.
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

9 years agomod_proxy: don't recyle backend announced "Connection: close" connections
William A. Rowe Jr [Thu, 30 Jun 2016 17:07:29 +0000 (17:07 +0000)] 
mod_proxy: don't recyle backend announced "Connection: close" connections
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

9 years agomod_substitute: Allow to configure the patterns merge order with the new
William A. Rowe Jr [Thu, 30 Jun 2016 16:59:58 +0000 (16:59 +0000)] 
mod_substitute: Allow to configure the patterns merge order with the new
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

9 years agoMore bugfixes required.
Yann Ylavic [Wed, 29 Jun 2016 22:59:46 +0000 (22:59 +0000)] 
More bugfixes required.

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

9 years agovote for memcache crash fix
Eric Covener [Wed, 29 Jun 2016 22:52:17 +0000 (22:52 +0000)] 
vote for memcache crash fix

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

9 years agoAdd CHANGES entry in mod_mem_cache patch relating to PR 45049.
Yann Ylavic [Wed, 29 Jun 2016 21:38:02 +0000 (21:38 +0000)] 
Add CHANGES entry in mod_mem_cache patch relating to PR 45049.
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

9 years agoVotes + promotes, and clarify suggested patch improvements
William A. Rowe Jr [Wed, 29 Jun 2016 18:50:39 +0000 (18:50 +0000)] 
Votes + promotes, and clarify suggested patch improvements

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

9 years agoupdate transformation
André Malo [Tue, 28 Jun 2016 19:37:05 +0000 (19:37 +0000)] 
update transformation

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

9 years agoClarify note from r1750226.
Yann Ylavic [Sat, 25 Jun 2016 22:45:23 +0000 (22:45 +0000)] 
Clarify note from r1750226.

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

9 years agoNote that more backports are needed after r1723567.
Yann Ylavic [Sat, 25 Jun 2016 21:43:43 +0000 (21:43 +0000)] 
Note that more backports are needed after r1723567.

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

9 years agoFix people->home links, propose new mem_cache_client_abort fix, vote and promote.
Yann Ylavic [Sat, 25 Jun 2016 21:27:43 +0000 (21:27 +0000)] 
Fix people->home links, propose new mem_cache_client_abort fix, vote and promote.

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

9 years agoUpvotes, note missing patches
William A. Rowe Jr [Thu, 16 Jun 2016 22:02:55 +0000 (22:02 +0000)] 
Upvotes, note missing patches

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