Re: [2.2 PATCH] fix HttpProtocolOptions (etc) merging

2017-02-20 Thread William A Rowe Jr
On Mon, Feb 20, 2017 at 10:16 AM, Joe Orton wrote: > > FYI, since I've seen people thinking seriously about test suites, this > kind of issue is impossible to test comprehensively with the current > test framework. We really need to spin up httpd multiple times with > different

Re: [2.2 PATCH] fix HttpProtocolOptions (etc) merging

2017-02-20 Thread Joe Orton
On Fri, Feb 17, 2017 at 12:38:30PM -0500, Eric Covener wrote: > +1 > > On Fri, Feb 17, 2017 at 12:37 PM, William A Rowe Jr > wrote: > > Great catch; +1 to commit to 2.2.x and > > http://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict/ > > branches. > >

Re: [2.2 PATCH] fix HttpProtocolOptions (etc) merging

2017-02-17 Thread Eric Covener
+1 On Fri, Feb 17, 2017 at 12:37 PM, William A Rowe Jr wrote: > Great catch; +1 to commit to 2.2.x and > http://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict/ > branches. > > And thanks for adding the breadcrumb for the next sucker to miss this :-O >

Re: [2.2 PATCH] fix HttpProtocolOptions (etc) merging

2017-02-17 Thread William A Rowe Jr
Great catch; +1 to commit to 2.2.x and http://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict/ branches. And thanks for adding the breadcrumb for the next sucker to miss this :-O On Fri, Feb 17, 2017 at 3:30 AM, Joe Orton wrote: > Found during QA of the

[2.2 PATCH] fix HttpProtocolOptions (etc) merging

2017-02-17 Thread Joe Orton
Found during QA of the CVE-2016-8743 patch here. The merging logic in merge_core_server_configs is (confusingly) inverted from 2.2 to 2.4, so e.g. HttpProtocolOptions doesn't inherit from global to vhost configs in 2.2.32. :( Index: server/core.c