From 5b050ad7e6702f09aaa77d42599c06041e7ab35d Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Mon, 23 Jul 2018 08:54:55 +0000 Subject: [PATCH] Merged x2. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1836473 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/STATUS b/STATUS index 85cefda2a2..de84ad5862 100644 --- a/STATUS +++ b/STATUS @@ -124,10 +124,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) mod_proxy_balancer: fix APR 1.4 compatibility - trunk patch: (not required) - 2.4.x patch: http://people.apache.org/~jorton/ap_balancer_apr14x.patch - +1: jorton, rpluem, ylavic PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -179,16 +175,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 2.4.x patch: svn merge -c 1801144,1801148,1801456 ^/httpd/httpd/trunk . +1: jailletc36 - *) mod_ssl: Fix regression discovered by Frank Meier regarding the default - value for SSLOCSPOverrideResponder which is already fixed in trunk by - r1555631. Backport version of r1555631 and patch by Frank Meier are the - same. - Trunk version of patch: - http://svn.apache.org/r1555631 - Backport version for 2.4.x of patch: - http://home.apache.org/~rpluem/patches/r555631_backport.diff - +1: rpluem, ylavic, - PATCHES/ISSUES THAT ARE BEING WORKED [ New entries should be added at the START of the list ] -- 2.50.1