From: Yann Ylavic Date: Sat, 30 Sep 2017 19:23:02 +0000 (+0000) Subject: Nevermind, my merge missed r1810089 somehow... X-Git-Tag: 2.4.29~75 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29065c4a954c1fa7a9044e64afacb121e4201bd6;p=thirdparty%2Fapache%2Fhttpd.git Nevermind, my merge missed r1810089 somehow... git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1810232 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index d8817c2de10..3102b0ca2a3 100644 --- a/STATUS +++ b/STATUS @@ -125,8 +125,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: *) mod_http2: Fix race condition on request body handlign. 2.4.x patch: svn merge -c 1804096,1807238,1809981,1810088,1810089 ^/httpd/httpd/trunk . +1: icing, steffenal, ylavic - ylavic: Not sure about MOD_HTTP2_VERSION[_NUM] from the above merge. - Shouldn't it be 1.10.11 instead of 1.10.12-DEV? PATCHES PROPOSED TO BACKPORT FROM TRUNK: