From cvs-return-64728-archive-asf-public=cust-asf.ponee.io@httpd.apache.org Fri Nov 9 09:31:41 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 5E8F9180627 for ; Fri, 9 Nov 2018 09:31:41 +0100 (CET) Received: (qmail 35150 invoked by uid 500); 9 Nov 2018 08:31:40 -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 35141 invoked by uid 99); 9 Nov 2018 08:31:40 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Nov 2018 08:31:40 +0000 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 A90FE3A006D for ; Fri, 9 Nov 2018 08:31:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1846218 - /httpd/httpd/branches/2.4.x/STATUS Date: Fri, 09 Nov 2018 08:31:39 -0000 To: cvs@httpd.apache.org From: jorton@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20181109083139.A90FE3A006D@svn01-us-west.apache.org> Author: jorton Date: Fri Nov 9 08:31:39 2018 New Revision: 1846218 URL: http://svn.apache.org/viewvc?rev=1846218&view=rev Log: r1846112 is a bit too tomcatty, counter-proposal... 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=1846218&r1=1846217&r2=1846218&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/STATUS (original) +++ httpd/httpd/branches/2.4.x/STATUS Fri Nov 9 08:31:39 2018 @@ -209,10 +209,15 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: +1: icing, jim *) mod_ssl: Fixes PR 62654 where "require ssl" did not work on HTTP/2 - connections. - trunk patch: http://svn.apache.org/r1846112 - 2.4.x patch: svn merge -c 1846112 ^/httpd/httpd/trunk . - +1: icing, + connections, and PR 61519 where $HTTPS was incorrect for the + "SSLEngine optional" case. + trunk patch: http://svn.apache.org/r1829250 + http://svn.apache.org/r1829263 + http://svn.apache.org/r1846111 + 2.4.x patch: + http://people.apache.org/~jorton/modssl_is_tls.diff + svn merge --record-only -c 1829250,1829263,1846111 ^/httpd/httpd/trunk . + +1: jorton, *) mod_http2: change in cleanup strategy for slave connections. trunk patch: http://svn.apache.org/r1846125