You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2016/08/23 16:57:50 UTC
svn commit: r1757407 - /httpd/httpd/branches/2.2.x/STATUS
Author: wrowe
Date: Tue Aug 23 16:57:50 2016
New Revision: 1757407
URL: http://svn.apache.org/viewvc?rev=1757407&view=rev
Log:
The last proposed request handling backport to bring 2.2.x up to 2.4.x standards
Modified:
httpd/httpd/branches/2.2.x/STATUS
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1757407&r1=1757406&r2=1757407&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Tue Aug 23 16:57:50 2016
@@ -197,12 +197,30 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
Support custom ErrorDocuments for HTTP 501 and 414 status codes.
PR: 48357, 57167
Submitted by: trawick, [Edward Lu <Chaosed0 gmail.com>]
+ Trunk version of patch
http://svn.apache.org/r1392347
http://svn.apache.org/r1635762
Backport:
https://raw.githubusercontent.com/wrowe/patches/master/backport-2.2.x-r1392347-r1635762.patch
+1: wrowe
+ *) core: Limit to ten the number of tolerated empty lines between request.
+ 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).
+ Exit early on ap_parse_uri failure, and ensure that proto_num and protocol
+ is set; this can happen with invalid CONNECT requests.
+ Submitted by: ylavic, rpluem
+ Note: http_request.c changes from this patch and follow-ups
+ r1710105, r1711902 are not applicable to the 2.2.x pipeline.
+ CHANGES is unnecessary, the regression was never released in 2.2.x.
+ Trunk version of patch
+ http://svn.apache.org/r1710095
+ http://svn.apache.org/r1727544
+ Backport:
+ https://raw.githubusercontent.com/wrowe/patches/master/backport-2.2.x-r1710095-1727544.patch
+ +1: wrowe
+
PATCHES/ISSUES THAT ARE STALLED
Re: svn commit: r1757407 - /httpd/httpd/branches/2.2.x/STATUS
Posted by William A Rowe Jr <wr...@rowe-clan.net>.
Thanks Yann, I'll work from my notes and a fresh checkout to revise ASAP.
On Aug 31, 2016 3:00 PM, "Yann Ylavic" <yl...@gmail.com> wrote:
> On Wed, Aug 31, 2016 at 9:57 PM, Yann Ylavic <yl...@gmail.com> wrote:
> > On Wed, Aug 31, 2016 at 9:47 PM, William A Rowe Jr <wr...@rowe-clan.net>
> wrote:
> >> On Aug 31, 2016 2:31 PM, "Yann Ylavic" <yl...@gmail.com> wrote:
> >>>
> >>> On Wed, Aug 31, 2016 at 9:05 PM, William A Rowe Jr <
> wrowe@rowe-clan.net>
> >>> wrote:
> >>> >
> >>> > One more reviewer would be appreciated to get these in sync, in
> >>> > preparation
> >>> > for the stronger parser on both of the release branches.
> >>>
> >>> My +1 on backport-2.2.x-r892678.patch, but I couldn't apply
> >>> backport-2.2.x-r951900-r1178566-r1185385-r1188745-
> r1352911-r1433613.patch
> >>> on the current 2.2.x...
> >>
> >> Just to clarify, these patches are necessarily cumulative
> >
> > I just backported the two accepted ones, still none of the two
> > remaining ones applies cleanly (first)...
>
> Attached the failing hunks for server/protocol.c (with
> backport-2.2.x-r951900-r1178566-r1185385-r1188745-
> r1352911-r1433613.patch).
>
Re: svn commit: r1757407 - /httpd/httpd/branches/2.2.x/STATUS
Posted by Yann Ylavic <yl...@gmail.com>.
On Wed, Aug 31, 2016 at 9:57 PM, Yann Ylavic <yl...@gmail.com> wrote:
> On Wed, Aug 31, 2016 at 9:47 PM, William A Rowe Jr <wr...@rowe-clan.net> wrote:
>> On Aug 31, 2016 2:31 PM, "Yann Ylavic" <yl...@gmail.com> wrote:
>>>
>>> On Wed, Aug 31, 2016 at 9:05 PM, William A Rowe Jr <wr...@rowe-clan.net>
>>> wrote:
>>> >
>>> > One more reviewer would be appreciated to get these in sync, in
>>> > preparation
>>> > for the stronger parser on both of the release branches.
>>>
>>> My +1 on backport-2.2.x-r892678.patch, but I couldn't apply
>>> backport-2.2.x-r951900-r1178566-r1185385-r1188745-r1352911-r1433613.patch
>>> on the current 2.2.x...
>>
>> Just to clarify, these patches are necessarily cumulative
>
> I just backported the two accepted ones, still none of the two
> remaining ones applies cleanly (first)...
Attached the failing hunks for server/protocol.c (with
backport-2.2.x-r951900-r1178566-r1185385-r1188745-r1352911-r1433613.patch).
Re: svn commit: r1757407 - /httpd/httpd/branches/2.2.x/STATUS
Posted by Yann Ylavic <yl...@gmail.com>.
On Wed, Aug 31, 2016 at 9:47 PM, William A Rowe Jr <wr...@rowe-clan.net> wrote:
> On Aug 31, 2016 2:31 PM, "Yann Ylavic" <yl...@gmail.com> wrote:
>>
>> On Wed, Aug 31, 2016 at 9:05 PM, William A Rowe Jr <wr...@rowe-clan.net>
>> wrote:
>> >
>> > One more reviewer would be appreciated to get these in sync, in
>> > preparation
>> > for the stronger parser on both of the release branches.
>>
>> My +1 on backport-2.2.x-r892678.patch, but I couldn't apply
>> backport-2.2.x-r951900-r1178566-r1185385-r1188745-r1352911-r1433613.patch
>> on the current 2.2.x...
>
> Just to clarify, these patches are necessarily cumulative
I just backported the two accepted ones, still none of the two
remaining ones applies cleanly (first)...
Re: svn commit: r1757407 - /httpd/httpd/branches/2.2.x/STATUS
Posted by William A Rowe Jr <wr...@rowe-clan.net>.
On Aug 31, 2016 2:31 PM, "Yann Ylavic" <yl...@gmail.com> wrote:
>
> On Wed, Aug 31, 2016 at 9:05 PM, William A Rowe Jr <wr...@rowe-clan.net>
wrote:
> >
> > One more reviewer would be appreciated to get these in sync, in
preparation
> > for the stronger parser on both of the release branches.
>
> My +1 on backport-2.2.x-r892678.patch, but I couldn't apply
> backport-2.2.x-r951900-r1178566-r1185385-r1188745-r1352911-r1433613.patch
> on the current 2.2.x...
Just to clarify, these patches are necessarily cumulative
Re: svn commit: r1757407 - /httpd/httpd/branches/2.2.x/STATUS
Posted by Yann Ylavic <yl...@gmail.com>.
On Wed, Aug 31, 2016 at 9:05 PM, William A Rowe Jr <wr...@rowe-clan.net> wrote:
>
> One more reviewer would be appreciated to get these in sync, in preparation
> for the stronger parser on both of the release branches.
My +1 on backport-2.2.x-r892678.patch, but I couldn't apply
backport-2.2.x-r951900-r1178566-r1185385-r1188745-r1352911-r1433613.patch
on the current 2.2.x...
Regards,
Yann.
Re: svn commit: r1757407 - /httpd/httpd/branches/2.2.x/STATUS
Posted by William A Rowe Jr <wr...@rowe-clan.net>.
On Thu, Aug 25, 2016 at 9:58 AM, William A Rowe Jr <wr...@rowe-clan.net>
wrote:
> On Thu, Aug 25, 2016 at 7:42 AM, Eric Covener <co...@gmail.com> wrote:
>
>> > + Backport:
>> > + https://raw.githubusercontent.com/wrowe/
>> patches/master/backport-2.2.x-r1710095-1727544.patch
>> > + +1: wrowe
>> > +
>>
>> backport link is bad
>>
>
> Fixed, thanks!
>
And thank you for all that review. There are still four lingering
backports, each
makes only one significant function change to 2.4.x behavior from 2.2.x's
(along
with various logging/comments/formating changes of much less effect) and
have
been distributed in 2.4 for some significantly long time now.
One more reviewer would be appreciated to get these in sync, in preparation
for the stronger parser on both of the release branches.
TIA,
Bill
Re: svn commit: r1757407 - /httpd/httpd/branches/2.2.x/STATUS
Posted by William A Rowe Jr <wr...@rowe-clan.net>.
On Thu, Aug 25, 2016 at 7:42 AM, Eric Covener <co...@gmail.com> wrote:
> > + Backport:
> > + https://raw.githubusercontent.com/wrowe/patches/master/
> backport-2.2.x-r1710095-1727544.patch
> > + +1: wrowe
> > +
>
> backport link is bad
>
Fixed, thanks!
Re: svn commit: r1757407 - /httpd/httpd/branches/2.2.x/STATUS
Posted by Eric Covener <co...@gmail.com>.
On Tue, Aug 23, 2016 at 12:57 PM, <wr...@apache.org> wrote:
> + *) core: Limit to ten the number of tolerated empty lines between request.
> + 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).
> + Exit early on ap_parse_uri failure, and ensure that proto_num and protocol
> + is set; this can happen with invalid CONNECT requests.
> + Submitted by: ylavic, rpluem
> + Note: http_request.c changes from this patch and follow-ups
> + r1710105, r1711902 are not applicable to the 2.2.x pipeline.
> + CHANGES is unnecessary, the regression was never released in 2.2.x.
> + Trunk version of patch
> + http://svn.apache.org/r1710095
> + http://svn.apache.org/r1727544
> + Backport:
> + https://raw.githubusercontent.com/wrowe/patches/master/backport-2.2.x-r1710095-1727544.patch
> + +1: wrowe
> +
backport link is bad
--
Eric Covener
covener@gmail.com
Re: svn commit: r1757407 - /httpd/httpd/branches/2.2.x/STATUS
Posted by William A Rowe Jr <wr...@rowe-clan.net>.
So these cumulative 4 patches, each of which focuses on a different aspect
of the request handling behavior, represent all of the fixes to 2.4.x that
never
made it to 2.2.x. With these proposals adopted, I can propose a nearly
identical backport of the revised request handling logic to both 2.4.x and
2.2.x,
if folks would be kind enough to review these precursors.
Focusing on only ap_parse_uri through ap_read_request functions, I've
attached
the remaining delta between 2.2.x and 2.4.x, for anyone interested. All of
these
differences are to be expected.
On Tue, Aug 23, 2016 at 11:57 AM, <wr...@apache.org> wrote:
> Author: wrowe
> Date: Tue Aug 23 16:57:50 2016
> New Revision: 1757407
>
> URL: http://svn.apache.org/viewvc?rev=1757407&view=rev
> Log:
> The last proposed request handling backport to bring 2.2.x up to 2.4.x
> standards
>
> Modified:
> httpd/httpd/branches/2.2.x/STATUS
>
> Modified: httpd/httpd/branches/2.2.x/STATUS
> URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/
> STATUS?rev=1757407&r1=1757406&r2=1757407&view=diff
> ============================================================
> ==================
> --- httpd/httpd/branches/2.2.x/STATUS (original)
> +++ httpd/httpd/branches/2.2.x/STATUS Tue Aug 23 16:57:50 2016
> @@ -197,12 +197,30 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
> Support custom ErrorDocuments for HTTP 501 and 414 status codes.
> PR: 48357, 57167
> Submitted by: trawick, [Edward Lu <Chaosed0 gmail.com>]
> + Trunk version of patch
> http://svn.apache.org/r1392347
> http://svn.apache.org/r1635762
> Backport:
> https://raw.githubusercontent.com/wrowe/patches/master/
> backport-2.2.x-r1392347-r1635762.patch
> +1: wrowe
>
> + *) core: Limit to ten the number of tolerated empty lines between
> request.
> + 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).
> + Exit early on ap_parse_uri failure, and ensure that proto_num and
> protocol
> + is set; this can happen with invalid CONNECT requests.
> + Submitted by: ylavic, rpluem
> + Note: http_request.c changes from this patch and follow-ups
> + r1710105, r1711902 are not applicable to the 2.2.x pipeline.
> + CHANGES is unnecessary, the regression was never released in
> 2.2.x.
> + Trunk version of patch
> + http://svn.apache.org/r1710095
> + http://svn.apache.org/r1727544
> + Backport:
> + https://raw.githubusercontent.com/wrowe/patches/master/
> backport-2.2.x-r1710095-1727544.patch
> + +1: wrowe
> +
>
> PATCHES/ISSUES THAT ARE STALLED
>
>
>
>