Repository: trafficserver Updated Branches: refs/heads/master fb08ddd09 -> 6041b439a
TS-3406 Change TS_NPN_PROTOCOL_HTTP_2_0 to "h2" Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/6041b439 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/6041b439 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/6041b439 Branch: refs/heads/master Commit: 6041b439aa78e74d0e35bbfb2aeb3e66bc64368d Parents: fb08ddd Author: Leif Hedstrom <[email protected]> Authored: Mon Feb 23 22:26:07 2015 -0700 Committer: Leif Hedstrom <[email protected]> Committed: Mon Feb 23 22:26:07 2015 -0700 ---------------------------------------------------------------------- CHANGES | 2 ++ lib/records/RecHttp.cc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6041b439/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index b3ba2ba..3dd3142 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 5.3.0 + *) [TS-3406] Change TS_NPN_PROTOCOL_HTTP_2_0 to "h2". + *) [TS-3376] Add traffic_ctl, a new command line management tool. *) [TS-3403] Stop parsing command-line options at the first non-option. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6041b439/lib/records/RecHttp.cc ---------------------------------------------------------------------- diff --git a/lib/records/RecHttp.cc b/lib/records/RecHttp.cc index 6551788..47979f4 100644 --- a/lib/records/RecHttp.cc +++ b/lib/records/RecHttp.cc @@ -36,7 +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 = "h2-14"; // draft-ietf-httpbis-http2-14 +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"; const char * const TS_NPN_PROTOCOL_SPDY_3 = "spdy/3";
