]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
William A. Rowe Jr [Mon, 9 Jan 2017 16:05:52 +0000 (16:05 +0000)]
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
William A. Rowe Jr [Mon, 9 Jan 2017 15:58:24 +0000 (15:58 +0000)]
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
William A. Rowe Jr [Mon, 9 Jan 2017 15:53:52 +0000 (15:53 +0000)]
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
Lucien Gentis [Sun, 8 Jan 2017 17:15:19 +0000 (17:15 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1777895 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 8 Jan 2017 17:14:12 +0000 (17:14 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1777894 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 7 Jan 2017 13:12:53 +0000 (13:12 +0000)]
Comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1777782 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 7 Jan 2017 13:01:12 +0000 (13:01 +0000)]
Backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1777780 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 7 Jan 2017 13:00:39 +0000 (13:00 +0000)]
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
Yann Ylavic [Sat, 7 Jan 2017 12:57:16 +0000 (12:57 +0000)]
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
Yann Ylavic [Sat, 7 Jan 2017 12:51:25 +0000 (12:51 +0000)]
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
William A. Rowe Jr [Sat, 7 Jan 2017 04:06:44 +0000 (04:06 +0000)]
dev@ votes noted
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1777751 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 7 Jan 2017 02:16:21 +0000 (02:16 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1777746 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 7 Jan 2017 00:38:50 +0000 (00:38 +0000)]
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
Yann Ylavic [Fri, 6 Jan 2017 23:41:54 +0000 (23:41 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1777734 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 6 Jan 2017 19:43:43 +0000 (19:43 +0000)]
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
Yann Ylavic [Fri, 6 Jan 2017 18:21:01 +0000 (18:21 +0000)]
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
Yann Ylavic [Thu, 5 Jan 2017 23:13:12 +0000 (23:13 +0000)]
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
Yann Ylavic [Thu, 5 Jan 2017 23:10:03 +0000 (23:10 +0000)]
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
Eric Covener [Thu, 5 Jan 2017 18:58:04 +0000 (18:58 +0000)]
checked in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1777495 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 5 Jan 2017 18:57:49 +0000 (18:57 +0000)]
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
Eric Covener [Thu, 5 Jan 2017 18:56:13 +0000 (18:56 +0000)]
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
Eric Covener [Thu, 5 Jan 2017 18:55:24 +0000 (18:55 +0000)]
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
Eric Covener [Thu, 5 Jan 2017 18:54:24 +0000 (18:54 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1777491 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 5 Jan 2017 18:52:44 +0000 (18:52 +0000)]
promo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1777490 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 5 Jan 2017 18:04:14 +0000 (18:04 +0000)]
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
Yann Ylavic [Thu, 5 Jan 2017 11:39:58 +0000 (11:39 +0000)]
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
Eric Covener [Thu, 5 Jan 2017 01:59:37 +0000 (01:59 +0000)]
committed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1777406 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 5 Jan 2017 01:57:54 +0000 (01:57 +0000)]
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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