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/11/14 19:02:29 UTC
svn commit: r1769677 - /httpd/httpd/branches/2.4.x/STATUS
Author: wrowe
Date: Mon Nov 14 19:02:29 2016
New Revision: 1769677
URL: http://svn.apache.org/viewvc?rev=1769677&view=rev
Log:
Promote one patch, propose one historically tangled patch
Modified:
httpd/httpd/branches/2.4.x/STATUS
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1769677&r1=1769676&r2=1769677&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Nov 14 19:02:29 2016
@@ -123,6 +123,11 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
2.4.x patch: trunk works modulo CHANGES
+1: covener, jim, jchampion
+ *) ssl: clear the error queue before SSL_read/write/accept(). PR60223
+ trunk patch: http://svn.apache.org/r1769332
+ 2.4.x patch: https://home.apache.org/~jchampion/patches/2.4.x-ssl-error-queue.patch
+ +1: jchampion, rpluem, wrowe
+
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
@@ -229,11 +234,13 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
2.4.x patch: trunk works
+1: jchampion, rpluem
- *) ssl: clear the error queue before SSL_read/write/accept(). PR60223
- trunk patch: http://svn.apache.org/r1769332
- 2.4.x patch: https://home.apache.org/~jchampion/patches/2.4.x-ssl-error-queue.patch
- +1: jchampion, rpluem
-
+ *) Propose default strict RFC7230 behavior, and HttpProtocolOptions directive
+ to relax or further constrain some behaviors.
+ trunk patches: too numerous to list, see
+ svn log --stop-on-copy http://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-merge-http-strict/
+ 2.4.x patch: see
+ svn diff -r1767912:HEAD http://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-merge-http-strict/
+ +1: wrowe
PATCHES/ISSUES THAT ARE BEING WORKED
Re: svn commit: r1769677 - /httpd/httpd/branches/2.4.x/STATUS
Posted by William A Rowe Jr <wr...@rowe-clan.net>.
On Mon, Nov 14, 2016 at 8:07 PM, William A Rowe Jr <wr...@rowe-clan.net>
wrote:
> On Mon, Nov 14, 2016 at 1:02 PM, <wr...@apache.org> wrote:
>
>> Author: wrowe
>> Date: Mon Nov 14 19:02:29 2016
>> New Revision: 1769677
>>
>> URL: http://svn.apache.org/viewvc?rev=1769677&view=rev
>> Log:
>> Promote one patch, propose one historically tangled patch
>>
>> + *) Propose default strict RFC7230 behavior, and HttpProtocolOptions
>> directive
>> + to relax or further constrain some behaviors.
>> + trunk patches: too numerous to list, see
>> + svn log --stop-on-copy http://svn.apache.org/repos/as
>> f/httpd/httpd/branches/2.4.x-merge-http-strict/
>> + 2.4.x patch: see
>> + svn diff -r1767912:HEAD http://svn.apache.org/repos/as
>> f/httpd/httpd/branches/2.4.x-merge-http-strict/
>> + +1: wrowe
>>
>
> Patch attached. There were some incremental comments to the merge branch
> that may or may not still apply, please reiterate your point.
>
The patch suggested by rpluem has been integrated, a small broken diff
to the httpd.h is corrected. So I'm attaching a refreshed net diff.
> I'm aware of one possible failing of this backport which I would like to
> fix on
> 2.4 after the backport is in... compilers may complain of assignment of the
> r->protocol to a const char*, we may need apr_pstrcpy's scattered about.
>
In practice I've found no error here, not even a warning in maintainer mode.
> Thanks to everyone who has contributed to this work on trunk/ or simply
> providing feedback on dev@.
>
> The earliest i will commit this backport is noon-ish Tuesday from Spain.
>
Looking forward to some reviewers of this net patch so we can move forward.
Re: svn commit: r1769677 - /httpd/httpd/branches/2.4.x/STATUS
Posted by William A Rowe Jr <wr...@rowe-clan.net>.
On Mon, Nov 14, 2016 at 1:02 PM, <wr...@apache.org> wrote:
> Author: wrowe
> Date: Mon Nov 14 19:02:29 2016
> New Revision: 1769677
>
> URL: http://svn.apache.org/viewvc?rev=1769677&view=rev
> Log:
> Promote one patch, propose one historically tangled patch
>
> + *) Propose default strict RFC7230 behavior, and HttpProtocolOptions
> directive
> + to relax or further constrain some behaviors.
> + trunk patches: too numerous to list, see
> + svn log --stop-on-copy http://svn.apache.org/repos/
> asf/httpd/httpd/branches/2.4.x-merge-http-strict/
> + 2.4.x patch: see
> + svn diff -r1767912:HEAD http://svn.apache.org/repos/
> asf/httpd/httpd/branches/2.4.x-merge-http-strict/
> + +1: wrowe
>
>
Patch attached. There were some incremental comments to the merge branch
that may or may not still apply, please reiterate your point.
I'm aware of one possible failing of this backport which I would like to
fix on
2.4 after the backport is in... compilers may complain of assignment of the
r->protocol to a const char*, we may need apr_pstrcpy's scattered about.
Thanks to everyone who has contributed to this work on trunk/ or simply
providing feedback on dev@.
The earliest i will commit this backport is noon-ish Tuesday from Spain.