From: William A. Rowe Jr <wrowe@apache.org>
Date: Mon, 7 Dec 2015 18:08:30 +0000 (+0000)
Subject: Better explain what this patch does and doesn't do
X-Git-Tag: 2.4.18~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad7bdb88037002365a2313aa7225cac0d660d156;p=thirdparty%2Fapache%2Fhttpd.git

Better explain what this patch does and doesn't do

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

diff --git a/STATUS b/STATUS
index 72097d8ac0a..e5e53312f15 100644
--- a/STATUS
+++ b/STATUS
@@ -154,6 +154,15 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: https://people.apache.org/~jailletc36/remove_return.patch
      +1: jailletc36, jim
 
+  *) mod_ssl: Fix missing TLS Upgrade/Connection headers on OPTIONS * requests
+     (Note that this is simply a necessary band-aid, and still won't allow h2c
+     to peacefully coexist with tls/n.n upgrades, because Upgrade phase needs
+     to come earlier, not as a handler, and the bogus connection-close behavior
+     must be removed before the Protocol API can handle TLS upgrade.)
+     PR58688
+     trunk patch: http://svn.apache.org/r1717816
+     +1: wrowe
+
 PATCHES/ISSUES THAT ARE BEING WORKED
 
   *) http: Don't remove the Content-Length of zero from a HEAD response if