From: Stefan Eissing <icing@apache.org>
Date: Tue, 3 Apr 2018 11:31:57 +0000 (+0000)
Subject: On the 2.4.x branch:
X-Git-Tag: 2.4.34~247
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=05fe2a46463b7ff279004386875c11612edf2ece;p=apache

On the 2.4.x branch:

backport proposal


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1828219 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 4029f9221c..3335bb51a0 100644
--- a/STATUS
+++ b/STATUS
@@ -263,6 +263,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1827865 ^/httpd/httpd/trunk .
      +1: jailletc36, jorton, 
 
+  *) 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 .
+     +1: icing
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]