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 EAD3C200B71 for ; Wed, 31 Aug 2016 21:39:09 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id E92F3160AB4; Wed, 31 Aug 2016 19:39:09 +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 3A703160AA7 for ; Wed, 31 Aug 2016 21:39:09 +0200 (CEST) Received: (qmail 89568 invoked by uid 500); 31 Aug 2016 19:39:08 -0000 Mailing-List: contact cvs-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 cvs@httpd.apache.org Received: (qmail 89559 invoked by uid 99); 31 Aug 2016 19:39:08 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Aug 2016 19:39:08 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id D7D79187920 for ; Wed, 31 Aug 2016 19:39:07 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -0.426 X-Spam-Level: X-Spam-Status: No, score=-0.426 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id S7ugfvqCQvWx for ; Wed, 31 Aug 2016 19:39:05 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id 32FFB5F306 for ; Wed, 31 Aug 2016 19:39:05 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 42D9DE00B8 for ; Wed, 31 Aug 2016 19:39:04 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id C4AE33A0D27 for ; Wed, 31 Aug 2016 19:39:03 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1758668 - /httpd/httpd/branches/2.2.x/STATUS Date: Wed, 31 Aug 2016 19:39:03 -0000 To: cvs@httpd.apache.org From: ylavic@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160831193903.C4AE33A0D27@svn01-us-west.apache.org> archived-at: Wed, 31 Aug 2016 19:39:10 -0000 Author: ylavic Date: Wed Aug 31 19:39:02 2016 New Revision: 1758668 URL: http://svn.apache.org/viewvc?rev=1758668&view=rev Log: Vote, promote, plus another patching failure. 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=1758668&r1=1758667&r2=1758668&view=diff ============================================================================== --- httpd/httpd/branches/2.2.x/STATUS (original) +++ httpd/httpd/branches/2.2.x/STATUS Wed Aug 31 19:39:02 2016 @@ -116,6 +116,23 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: PR: 43039 +1: wrowe, covener, ylavic + *) 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-r1727544.patch + +1: wrowe, covener, ylavic + PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -205,23 +222,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: Backport: https://raw.githubusercontent.com/wrowe/patches/master/backport-2.2.x-r1392347-r1635762.patch +1: wrowe, covener - - *) 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-r1727544.patch - +1: wrowe, covener + ylavic: same here (hunk + access_status = HTTP_BAD_REQUEST;) + depends on the previous one? PATCHES/ISSUES THAT ARE STALLED