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

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

Issue 286313002: Accept and ignore PRIORITY frames in SPDY4+. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
« no previous file with comments | « net/spdy/spdy_protocol.h ('k') | net/spdy/spdy_protocol_test.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 (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/spdy_protocol.h" 5 #include "net/spdy/spdy_protocol.h"
6 6
7 namespace net { 7 namespace net {
8 8
9 SpdyFrameWithNameValueBlockIR::SpdyFrameWithNameValueBlockIR( 9 SpdyFrameWithNameValueBlockIR::SpdyFrameWithNameValueBlockIR(
10 SpdyStreamId stream_id) : SpdyFrameWithFinIR(stream_id) {} 10 SpdyStreamId stream_id) : SpdyFrameWithFinIR(stream_id) {}
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 return WINDOW_UPDATE; 91 return WINDOW_UPDATE;
92 } 92 }
93 break; 93 break;
94 case SPDY4: 94 case SPDY4:
95 case SPDY5: 95 case SPDY5:
96 switch (frame_type_field) { 96 switch (frame_type_field) {
97 case 0: 97 case 0:
98 return DATA; 98 return DATA;
99 case 1: 99 case 1:
100 return HEADERS; 100 return HEADERS;
101 // TODO(hkhalil): Add PRIORITY. 101 case 2:
102 return PRIORITY;
102 case 3: 103 case 3:
103 return RST_STREAM; 104 return RST_STREAM;
104 case 4: 105 case 4:
105 return SETTINGS; 106 return SETTINGS;
106 case 5: 107 case 5:
107 return PUSH_PROMISE; 108 return PUSH_PROMISE;
108 case 6: 109 case 6:
109 return PING; 110 return PING;
110 case 7: 111 case 7:
111 return GOAWAY; 112 return GOAWAY;
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 LOG(DFATAL) << "Serializing unhandled frame type " << frame_type; 152 LOG(DFATAL) << "Serializing unhandled frame type " << frame_type;
152 return -1; 153 return -1;
153 } 154 }
154 case SPDY4: 155 case SPDY4:
155 case SPDY5: 156 case SPDY5:
156 switch (frame_type) { 157 switch (frame_type) {
157 case DATA: 158 case DATA:
158 return 0; 159 return 0;
159 case HEADERS: 160 case HEADERS:
160 return 1; 161 return 1;
161 // TODO(hkhalil): Add PRIORITY. 162 case PRIORITY:
163 return 2;
162 case RST_STREAM: 164 case RST_STREAM:
163 return 3; 165 return 3;
164 case SETTINGS: 166 case SETTINGS:
165 return 4; 167 return 4;
166 case PUSH_PROMISE: 168 case PUSH_PROMISE:
167 return 5; 169 return 5;
168 case PING: 170 case PING:
169 return 6; 171 return 6;
170 case GOAWAY: 172 case GOAWAY:
171 return 7; 173 return 7;
(...skipping 621 matching lines...) Expand 10 before | Expand all | Expand 10 after
793 } 795 }
794 796
795 SpdyAltSvcIR::SpdyAltSvcIR(SpdyStreamId stream_id) 797 SpdyAltSvcIR::SpdyAltSvcIR(SpdyStreamId stream_id)
796 : SpdyFrameWithStreamIdIR(stream_id) {} 798 : SpdyFrameWithStreamIdIR(stream_id) {}
797 799
798 void SpdyAltSvcIR::Visit(SpdyFrameVisitor* visitor) const { 800 void SpdyAltSvcIR::Visit(SpdyFrameVisitor* visitor) const {
799 return visitor->VisitAltSvc(*this); 801 return visitor->VisitAltSvc(*this);
800 } 802 }
801 803
802 } // namespace net 804 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/spdy_protocol.h ('k') | net/spdy/spdy_protocol_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698