Promote one patch, propose one historically tangled patch

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

diff --git a/STATUS b/STATUS
index 16bb5ae7cd805133244c8a2e3aa8a98e0e395fed..1c6921e0a6bd7e2537ec34040de793efc0e7f608 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -123,6 +123,11 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch:  trunk works modulo CHANGES
      +1:  covener, jim, jchampion
 
+  *) ssl: clear the error queue before SSL_read/write/accept(). PR60223
+     trunk patch: http://svn.apache.org/r1769332
+     2.4.x patch: https://home.apache.org/~jchampion/patches/2.4.x-ssl-error-queue.patch
+     +1: jchampion, rpluem, wrowe
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -229,11 +234,13 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works
      +1: jchampion, rpluem
 
-  *) ssl: clear the error queue before SSL_read/write/accept(). PR60223
-     trunk patch: http://svn.apache.org/r1769332
-     2.4.x patch: https://home.apache.org/~jchampion/patches/2.4.x-ssl-error-queue.patch
-     +1: jchampion, rpluem
-
+  *) Propose default strict RFC7230 behavior, and HttpProtocolOptions directive
+     to relax or further constrain some behaviors.
+     trunk patches: too numerous to list, see 
+       svn log --stop-on-copy http://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-merge-http-strict/
+     2.4.x patch: see
+       svn diff -r1767912:HEAD http://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x-merge-http-strict/
+     +1: wrowe
 
 PATCHES/ISSUES THAT ARE BEING WORKED