Repository: trafficserver Updated Branches: refs/heads/master 0711dc2a2 -> ef45a39f8
TS-3152: stop offerring HTTP/2 over TLS by default We should only enable a protocol by default when it is considered ready. HTTP/2 is built-in so you always have it at compile time. SPDY has external dependencies so in most cases you won't have it. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ef45a39f Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ef45a39f Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ef45a39f Branch: refs/heads/master Commit: ef45a39f8b04a143a507bd2a997adc9a0c16d7d9 Parents: 0711dc2 Author: James Peach <[email protected]> Authored: Fri Oct 24 16:22:29 2014 -0700 Committer: James Peach <[email protected]> Committed: Fri Oct 24 16:24:06 2014 -0700 ---------------------------------------------------------------------- CHANGES | 2 ++ lib/records/RecHttp.cc | 3 +++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ef45a39f/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index c7cc3f2..0b833fb 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 5.2.0 + *) [TS-3152] stop offerring HTTP/2 over TLS by default. + *) [TS-3060] Fix memory leak in cleaning up tunnel resources *) [TS-3147] Improvements fo ESI plugin. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ef45a39f/lib/records/RecHttp.cc ---------------------------------------------------------------------- diff --git a/lib/records/RecHttp.cc b/lib/records/RecHttp.cc index 788b864..78c1edd 100644 --- a/lib/records/RecHttp.cc +++ b/lib/records/RecHttp.cc @@ -596,6 +596,9 @@ ts_session_protocol_well_known_name_indices_init() SPDY_PROTOCOL_SET.markIn(TS_NPN_PROTOCOL_INDEX_SPDY_3_1); DEFAULT_TLS_SESSION_PROTOCOL_SET.markAllIn(); + // Don't enable HTTP/2 by default until it is stable. + DEFAULT_TLS_SESSION_PROTOCOL_SET.markOut(HTTP2_PROTOCOL_SET); + DEFAULT_NON_TLS_SESSION_PROTOCOL_SET = HTTP_PROTOCOL_SET; }
