Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(785)

Side by Side Diff: net/socket/next_proto.cc

Issue 724523002: Support HTTP/2 drafts 14 and 15 simultaneously. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename CONNECTION_INFO_SPDY4 to CONNECTION_INFO_HTTP2. Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « net/socket/next_proto.h ('k') | net/socket/ssl_client_socket.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "next_proto.h" 5 #include "next_proto.h"
6 6
7 namespace net { 7 namespace net {
8 8
9 NextProtoVector NextProtosHttpOnly() { 9 NextProtoVector NextProtosHttpOnly() {
10 NextProtoVector next_protos; 10 NextProtoVector next_protos;
(...skipping 26 matching lines...) Expand all
37 next_protos.push_back(kProtoQUIC1SPDY3); 37 next_protos.push_back(kProtoQUIC1SPDY3);
38 next_protos.push_back(kProtoSPDY31); 38 next_protos.push_back(kProtoSPDY31);
39 return next_protos; 39 return next_protos;
40 } 40 }
41 41
42 NextProtoVector NextProtosSpdy4Http2() { 42 NextProtoVector NextProtosSpdy4Http2() {
43 NextProtoVector next_protos; 43 NextProtoVector next_protos;
44 next_protos.push_back(kProtoHTTP11); 44 next_protos.push_back(kProtoHTTP11);
45 next_protos.push_back(kProtoQUIC1SPDY3); 45 next_protos.push_back(kProtoQUIC1SPDY3);
46 next_protos.push_back(kProtoSPDY31); 46 next_protos.push_back(kProtoSPDY31);
47 next_protos.push_back(kProtoSPDY4); 47 next_protos.push_back(kProtoSPDY4_14);
48 next_protos.push_back(kProtoSPDY4_15);
48 return next_protos; 49 return next_protos;
49 } 50 }
50 51
51 } // namespace net 52 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/next_proto.h ('k') | net/socket/ssl_client_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698