From: Jim Jagielski <jim@apache.org>
Date: Mon, 5 Dec 2016 14:31:27 +0000 (+0000)
Subject: promote
X-Git-Tag: 2.4.24~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90e8702df4f041fac2b7bbb413096a434f48119e;p=thirdparty%2Fapache%2Fhttpd.git

promote


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

diff --git a/STATUS b/STATUS
index 757dd2e697f..0a9e10df4ca 100644
--- a/STATUS
+++ b/STATUS
@@ -117,6 +117,16 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  *) 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/
+       Last updated: 1 Dec with a missing element of http_filters.c
+     When testing, revert;
+       http://svn.apache.org/r1772339 
+     +1: wrowe, covener, jim
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -140,17 +150,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works
      +1: jim
 
-  *) 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/
-       Last updated: 1 Dec with a missing element of http_filters.c
-     When testing, revert;
-       http://svn.apache.org/r1772339 
-     +1: wrowe, covener, jim
-
   *) mod_ratelimit: Allow for initial burst of data before we start
      throttling: PR 60145
      trunk patches: