Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 125CA200C21 for ; Mon, 20 Feb 2017 17:17:12 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 10EED160B73; Mon, 20 Feb 2017 16:17:12 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5B2B7160B62 for ; Mon, 20 Feb 2017 17:17:11 +0100 (CET) Received: (qmail 14661 invoked by uid 500); 20 Feb 2017 16:17:10 -0000 Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list dev@httpd.apache.org Received: (qmail 14651 invoked by uid 99); 20 Feb 2017 16:17:10 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Feb 2017 16:17:10 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id F10F0C0258 for ; Mon, 20 Feb 2017 16:17:09 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -8.021 X-Spam-Level: X-Spam-Status: No, score=-8.021 tagged_above=-999 required=6.31 tests=[RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id JXkbt6T_NlGY for ; Mon, 20 Feb 2017 16:17:08 +0000 (UTC) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTPS id 9A0D05FC41 for ; Mon, 20 Feb 2017 16:17:08 +0000 (UTC) Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DF81A3D952 for ; Mon, 20 Feb 2017 16:16:02 +0000 (UTC) Received: from iberis (ovpn-120-61.rdu2.redhat.com [10.10.120.61] (may be forged)) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1KGG18w015132 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Mon, 20 Feb 2017 11:16:02 -0500 Received: from jorton by iberis with local (Exim 4.87) (envelope-from ) id 1cfqd6-0005UX-Bk for dev@httpd.apache.org; Mon, 20 Feb 2017 16:16:00 +0000 Date: Mon, 20 Feb 2017 16:16:00 +0000 From: Joe Orton To: dev@httpd.apache.org Subject: Re: [2.2 PATCH] fix HttpProtocolOptions (etc) merging Message-ID: <20170220161600.GA21055@redhat.com> Mail-Followup-To: dev@httpd.apache.org References: <20170217093032.GA1137@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.7.1 (2016-10-04) Organization: Registered in England and Wales under Company Registration No. 03798903 Directors: Michael Cunningham (US), Michael O'Neill (Ireland), Paul Argiry (US) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 20 Feb 2017 16:16:02 +0000 (UTC) archived-at: Mon, 20 Feb 2017 16:17:12 -0000 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. > > > > And thanks for adding the breadcrumb for the next sucker to miss this :-O Thanks for the reviews. 2.2.x => http://svn.apache.org/viewvc?rev=1783440&view=rev 2.2.x-merge-strict => http://svn.apache.org/viewvc?rev=1783441&view=rev 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 configurations, to test different combinations of global to vhost merges with default vs non-default options. (If there is some way to do that with the current test suite, I'd be interested to hear anyway.) Regads, Joe