Repository: trafficserver Updated Branches: refs/heads/master 6662bee36 -> c5a98a6d9
TS-2729 Change registration order, H2-14 should be highest I think Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/c5a98a6d Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/c5a98a6d Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/c5a98a6d Branch: refs/heads/master Commit: c5a98a6d9c281ad9cf45edaea8809d7973684901 Parents: 6662bee Author: Leif Hedstrom <[email protected]> Authored: Mon Feb 9 14:56:31 2015 -0700 Committer: Leif Hedstrom <[email protected]> Committed: Mon Feb 9 14:56:31 2015 -0700 ---------------------------------------------------------------------- proxy/http/HttpProxyServerMain.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c5a98a6d/proxy/http/HttpProxyServerMain.cc ---------------------------------------------------------------------- diff --git a/proxy/http/HttpProxyServerMain.cc b/proxy/http/HttpProxyServerMain.cc index 313cec2..44c1810 100644 --- a/proxy/http/HttpProxyServerMain.cc +++ b/proxy/http/HttpProxyServerMain.cc @@ -208,11 +208,6 @@ MakeHttpProxyAcceptor(HttpProxyAcceptor& acceptor, HttpProxyPort& port, unsigned ssl->registerEndpoint(TS_NPN_PROTOCOL_HTTP_1_1, http); } - // 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)); - } - // SPDY #if TS_HAS_SPDY if (port.m_session_protocol_preference.contains(TS_NPN_PROTOCOL_INDEX_SPDY_3)) { @@ -224,6 +219,11 @@ MakeHttpProxyAcceptor(HttpProxyAcceptor& acceptor, HttpProxyPort& port, unsigned } #endif + // 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)); + } + MUTEX_LOCK(lock, ssl_plugin_mutex, this_ethread()); ssl_plugin_acceptors.push(ssl);
