backport proposal of r1871810.

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

diff --git a/STATUS b/STATUS
index 74c5a23ce2a4a4818c31c894632dec5f125a716d..cc52998f19207e94e28d38efc1c236d6827497bc 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -259,18 +259,23 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                                  https://github.com/apache/httpd/pull/80.diff
      +1: rpluem, covener
 
-*) mod_http2: Fix mod_reqtimeout interworking on handshakes. Fix H2Directr config value.
+  *) mod_http2: Fix mod_reqtimeout interworking on handshakes. Fix H2Directr config value.
      trunk patch: http://svn.apache.org/r1870454
                   http://svn.apache.org/r1870499
      2.4.x patch: svn merge -c 1870454,1870499 ^/httpd/httpd/trunk .
      +1: icing, 
 
-* mod_lua: allow nil assignment to trigger apr_table_unset
+  *) mod_lua: allow nil assignment to trigger apr_table_unset
            (nil assignment to an APR table used to throw an error)
      trunk patch: http://svn.apache.org/r1870650
      2.4.x patch: svn merge -c 1870650 ^/httpd/httpd/trunk
      +1: covener,
 
+  *) mod_http2: Fixed rare cases where a h2 worker could deadlock the main connection. 
+     trunk patch: http://svn.apache.org/r1871810
+     2.4.x patch: svn merge -c 1871810 ^/httpd/httpd/trunk
+     +1: icing, 
+
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]