Merge pull request #948 from zwoop/TS-3407

TS-3407 Removes the legacy h2-14 identifiers
apache · Sep 1, 2016 · 55c1a8f · 55c1a8f
2 parents 01206ce + 1d7c1ee
commit 55c1a8f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/lib/records/RecHttp.cc b/lib/records/RecHttp.cc
@@ -33,11 +33,10 @@ SessionProtocolNameRegistry globalSessionProtocolNameRegistry;
    These are also used for NPN setup.
 */
 
-const char *const TS_ALPN_PROTOCOL_HTTP_0_9    = "http/0.9";
-const char *const TS_ALPN_PROTOCOL_HTTP_1_0    = "http/1.0";
-const char *const TS_ALPN_PROTOCOL_HTTP_1_1    = "http/1.1";
-const char *const TS_ALPN_PROTOCOL_HTTP_2_0_14 = "h2-14"; // Last H2 interrop draft. TODO: Should be removed later
-const char *const TS_ALPN_PROTOCOL_HTTP_2_0    = "h2";    // HTTP/2 over TLS
+const char *const TS_ALPN_PROTOCOL_HTTP_0_9 = "http/0.9";
+const char *const TS_ALPN_PROTOCOL_HTTP_1_0 = "http/1.0";
+const char *const TS_ALPN_PROTOCOL_HTTP_1_1 = "http/1.1";
+const char *const TS_ALPN_PROTOCOL_HTTP_2_0 = "h2"; // HTTP/2 over TLS
 
 const char *const TS_ALPN_PROTOCOL_GROUP_HTTP  = "http";
 const char *const TS_ALPN_PROTOCOL_GROUP_HTTP2 = "http2";

diff --git a/lib/ts/apidefs.h.in b/lib/ts/apidefs.h.in
@@ -1142,7 +1142,6 @@ extern tsapi int TS_HTTP_LEN_PUSH;
 extern tsapi const char *const TS_ALPN_PROTOCOL_HTTP_0_9;
 extern tsapi const char *const TS_ALPN_PROTOCOL_HTTP_1_0;
 extern tsapi const char *const TS_ALPN_PROTOCOL_HTTP_1_1;
-extern tsapi const char *const TS_ALPN_PROTOCOL_HTTP_2_0_14;
 extern tsapi const char *const TS_ALPN_PROTOCOL_HTTP_2_0;
 
 extern tsapi int TS_ALPN_PROTOCOL_INDEX_HTTP_0_9;

diff --git a/proxy/hdrs/HdrToken.h b/proxy/hdrs/HdrToken.h
@@ -380,7 +380,7 @@ hdrtoken_wks_to_flags(const char *wks)
   -------------------------------------------------------------------------*/
 
 // HTTP/2 Upgrade token
-#define MIME_UPGRADE_H2C_TOKEN "h2c-14"
+#define MIME_UPGRADE_H2C_TOKEN "h2c"
 
 /*-------------------------------------------------------------------------
   -------------------------------------------------------------------------*/

diff --git a/proxy/http/HttpProxyServerMain.cc b/proxy/http/HttpProxyServerMain.cc
@@ -202,8 +202,6 @@ MakeHttpProxyAcceptor(HttpProxyAcceptor &acceptor, HttpProxyPort &port, unsigned
     if (port.m_session_protocol_preference.contains(TS_ALPN_PROTOCOL_INDEX_HTTP_2_0)) {
       Http2SessionAccept *acc = new Http2SessionAccept(accept_opt);
 
-      // TODO: Should be removed when h2-14 is gone and dead, and h2 is widely supported in UAs
-      ssl->registerEndpoint(TS_ALPN_PROTOCOL_HTTP_2_0_14, acc);
       ssl->registerEndpoint(TS_ALPN_PROTOCOL_HTTP_2_0, acc);
     }