propose

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

diff --git a/STATUS b/STATUS
index 0de41d4d3da112f95f7f2264f72018d60258dacd..019997f63835042cff4c39fd6322d5f66bb797c4 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -232,13 +232,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      trunk revisions: 1804530,1804531,1804542,1804545,1804671,1804759,1804787,1804975,1805180,1805188,1805192,1805194,1805256,1805294,1805373,1806939,1807228,1807347,1807577,1807593,1807774,1807777,1808005,1808092,1808100,1808241,1808242,1808243,1808249,1808444,1809719,1809888,1810723,1811082,1811812,1812193,1812517,1812518,1812999,1813642,1814720,1814939,1815005,1815078,1815264,1815370,1815483,1816055,1816154,1816156
      2.4.x branch: ^/httpd/httpd/branches/2.4.x-mod_md
      2.4.x diff: svn diff ^/httpd/httpd/branches/2.4.x  ^/httpd/httpd/branches/2.4.x-mod_md 
-     2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/mod_md_ssl_complete.diff
-         svn merge of revisions with many conflicts in CHANGES, generated html and some changes that do not belong
-         The win build system changes are excluded at the moment, as I was unable to merge the
-         changes via svn. Probably the 2.4.x is hand-edited so it does not allow that. The necessary
-         windows changes are best made to the new branch and then, once working satisfactory, merged
-         over.
-         Resetting the votes.
      +1: icing
      -1: steffenal: OS signals error at httpd start. Details see post dev list
 
@@ -248,6 +241,13 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: icing, jorton 
      -0: steffenal: Not sure it not conflicts with other LE utilities challenges. Details see post dev list   
 
+  *) mod_http2: fixes unfair scheduling when number of active connections exceeds the
+     scheduling fifo capacity.
+     trunk revision: r1816619
+     2.4.x patch: svn merge -c 1816619 ^/httpd/httpd/trunk .
+     +1: icing
+
+
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]