From be7fa7fcd604b4bba2ad9464149b4361a401edae Mon Sep 17 00:00:00 2001
From: Stefan Eissing <icing@apache.org>
Date: Wed, 27 Nov 2019 11:22:55 +0000
Subject: [PATCH] update http2 backport proposal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1870500 13f79535-47bb-0310-9956-ffa450edef68
---
 STATUS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/STATUS b/STATUS
index c354dada410..6d18a606b21 100644
--- a/STATUS
+++ b/STATUS
@@ -261,7 +261,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
 *) mod_http2: Fix mod_reqtimeout interworking on handshakes. Fix H2Directr config value.
      trunk patch: http://svn.apache.org/r1870454
-     2.4.x patch: svn merge -c 1870454 ^/httpd/httpd/trunk .
+                  http://svn.apache.org/r1870499
+     2.4.x patch: svn merge -c 1870454,1870499 ^/httpd/httpd/trunk .
      +1: icing, 
 
 PATCHES/ISSUES THAT ARE BEING WORKED
-- 
2.47.3