From e0e8b8a3f6a3642ecca48331ea735c8ad5742a7a Mon Sep 17 00:00:00 2001 From: Stefan Eissing Date: Tue, 3 Apr 2018 13:07:16 +0000 Subject: [PATCH] updated backport proposal git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1828234 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/STATUS b/STATUS index 3335bb51a0..ed2bf3656e 100644 --- a/STATUS +++ b/STATUS @@ -266,7 +266,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: *) mod_http2: normalize trace2 logging of http2 unencrypted connection upgrades. trunk patch: http://svn.apache.org/r1828210 - 2.4.x patch: svn merge -c 1828210 ^/httpd/httpd/trunk . + http://svn.apache.org/r1828232 + 2.4.x patch: svn merge -c 1828210,182823 ^/httpd/httpd/trunk . +1: icing PATCHES/ISSUES THAT ARE BEING WORKED -- 2.40.0