You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2015/02/24 20:45:29 UTC
trafficserver git commit: TS-3406 Add endpoints for h2-14 as well as
h2, at least until 7.0
Repository: trafficserver
Updated Branches:
refs/heads/master a1f85b0e2 -> 488ba88a0
TS-3406 Add endpoints for h2-14 as well as h2, at least until 7.0
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/488ba88a
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/488ba88a
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/488ba88a
Branch: refs/heads/master
Commit: 488ba88a037b3030d37637d96cdc8affc886486a
Parents: a1f85b0
Author: Leif Hedstrom <zw...@apache.org>
Authored: Tue Feb 24 12:36:44 2015 -0700
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Tue Feb 24 12:38:31 2015 -0700
----------------------------------------------------------------------
lib/records/RecHttp.cc | 1 +
lib/ts/apidefs.h.in | 1 +
proxy/http/HttpProxyServerMain.cc | 6 +++++-
3 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/488ba88a/lib/records/RecHttp.cc
----------------------------------------------------------------------
diff --git a/lib/records/RecHttp.cc b/lib/records/RecHttp.cc
index 47979f4..af72e46 100644
--- a/lib/records/RecHttp.cc
+++ b/lib/records/RecHttp.cc
@@ -36,6 +36,7 @@ SessionProtocolNameRegistry globalSessionProtocolNameRegistry;
const char * const TS_NPN_PROTOCOL_HTTP_0_9 = "http/0.9";
const char * const TS_NPN_PROTOCOL_HTTP_1_0 = "http/1.0";
const char * const TS_NPN_PROTOCOL_HTTP_1_1 = "http/1.1";
+const char * const TS_NPN_PROTOCOL_HTTP_2_0_14 = "h2-14"; // Last H2 interrop draft. TODO: Should be removed later
const char * const TS_NPN_PROTOCOL_HTTP_2_0 = "h2"; // HTTP/2 over TLS
const char * const TS_NPN_PROTOCOL_SPDY_1 = "spdy/1"; // obsolete
const char * const TS_NPN_PROTOCOL_SPDY_2 = "spdy/2";
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/488ba88a/lib/ts/apidefs.h.in
----------------------------------------------------------------------
diff --git a/lib/ts/apidefs.h.in b/lib/ts/apidefs.h.in
index 1b04211..be3a580 100644
--- a/lib/ts/apidefs.h.in
+++ b/lib/ts/apidefs.h.in
@@ -1154,6 +1154,7 @@ extern "C"
extern tsapi const char * const TS_NPN_PROTOCOL_HTTP_0_9;
extern tsapi const char * const TS_NPN_PROTOCOL_HTTP_1_0;
extern tsapi const char * const TS_NPN_PROTOCOL_HTTP_1_1;
+ extern tsapi const char * const TS_NPN_PROTOCOL_HTTP_2_0_14;
extern tsapi const char * const TS_NPN_PROTOCOL_HTTP_2_0;
extern tsapi const char * const TS_NPN_PROTOCOL_SPDY_1;
extern tsapi const char * const TS_NPN_PROTOCOL_SPDY_2;
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/488ba88a/proxy/http/HttpProxyServerMain.cc
----------------------------------------------------------------------
diff --git a/proxy/http/HttpProxyServerMain.cc b/proxy/http/HttpProxyServerMain.cc
index 44c1810..b9e7095 100644
--- a/proxy/http/HttpProxyServerMain.cc
+++ b/proxy/http/HttpProxyServerMain.cc
@@ -221,7 +221,11 @@ MakeHttpProxyAcceptor(HttpProxyAcceptor& acceptor, HttpProxyPort& port, unsigned
// HTTP2
if (port.m_session_protocol_preference.contains(TS_NPN_PROTOCOL_INDEX_HTTP_2_0)) {
- ssl->registerEndpoint(TS_NPN_PROTOCOL_HTTP_2_0, new Http2SessionAccept(accept_opt));
+ 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_NPN_PROTOCOL_HTTP_2_0_14, acc);
+ ssl->registerEndpoint(TS_NPN_PROTOCOL_HTTP_2_0, acc);
}
MUTEX_LOCK(lock, ssl_plugin_mutex, this_ethread());