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

Side by Side Diff: net/spdy/buffered_spdy_framer.cc

Issue 25977005: [SPDY] Do not advertise SPDY/2 by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 2 months 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "net/spdy/buffered_spdy_framer.h" 5 #include "net/spdy/buffered_spdy_framer.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 8
9 namespace net { 9 namespace net {
10 10
11 SpdyMajorVersion NextProtoToSpdyMajorVersion(NextProto next_proto) { 11 SpdyMajorVersion NextProtoToSpdyMajorVersion(NextProto next_proto) {
12 switch (next_proto) { 12 switch (next_proto) {
13 case kProtoSPDY2: 13 case kProtoDeprecatedSPDY2:
14 return SPDY2; 14 return SPDY2;
15 case kProtoSPDY3: 15 case kProtoSPDY3:
16 case kProtoSPDY31: 16 case kProtoSPDY31:
17 return SPDY3; 17 return SPDY3;
18 // SPDY/4 and HTTP/2 share the same framing for now. 18 // SPDY/4 and HTTP/2 share the same framing for now.
19 case kProtoSPDY4a2: 19 case kProtoSPDY4a2:
20 case kProtoHTTP2Draft04: 20 case kProtoHTTP2Draft04:
21 return SPDY4; 21 return SPDY4;
22 case kProtoUnknown: 22 case kProtoUnknown:
23 case kProtoHTTP11: 23 case kProtoHTTP11:
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 320
321 void BufferedSpdyFramer::InitHeaderStreaming(SpdyStreamId stream_id) { 321 void BufferedSpdyFramer::InitHeaderStreaming(SpdyStreamId stream_id) {
322 memset(header_buffer_, 0, kHeaderBufferSize); 322 memset(header_buffer_, 0, kHeaderBufferSize);
323 header_buffer_used_ = 0; 323 header_buffer_used_ = 0;
324 header_buffer_valid_ = true; 324 header_buffer_valid_ = true;
325 header_stream_id_ = stream_id; 325 header_stream_id_ = stream_id;
326 DCHECK_NE(header_stream_id_, SpdyFramer::kInvalidStream); 326 DCHECK_NE(header_stream_id_, SpdyFramer::kInvalidStream);
327 } 327 }
328 328
329 } // namespace net 329 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_pool_unittest.cc ('k') | net/spdy/buffered_spdy_framer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698