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

Side by Side Diff: net/quic/chromium/quic_http_stream.cc

Issue 2808273006: Landing Recent QUIC changes until Sun Apr 9 16:12:55 (Closed)
Patch Set: increment enabled_options in e2e test Created 3 years, 8 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
« no previous file with comments | « net/http/http_response_info.cc ('k') | net/quic/core/congestion_control/bbr_sender_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/quic/chromium/quic_http_stream.h" 5 #include "net/quic/chromium/quic_http_stream.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/auto_reset.h" 9 #include "base/auto_reset.h"
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 case QUIC_VERSION_34: 144 case QUIC_VERSION_34:
145 return HttpResponseInfo::CONNECTION_INFO_QUIC_34; 145 return HttpResponseInfo::CONNECTION_INFO_QUIC_34;
146 case QUIC_VERSION_35: 146 case QUIC_VERSION_35:
147 return HttpResponseInfo::CONNECTION_INFO_QUIC_35; 147 return HttpResponseInfo::CONNECTION_INFO_QUIC_35;
148 case QUIC_VERSION_36: 148 case QUIC_VERSION_36:
149 return HttpResponseInfo::CONNECTION_INFO_QUIC_36; 149 return HttpResponseInfo::CONNECTION_INFO_QUIC_36;
150 case QUIC_VERSION_37: 150 case QUIC_VERSION_37:
151 return HttpResponseInfo::CONNECTION_INFO_QUIC_37; 151 return HttpResponseInfo::CONNECTION_INFO_QUIC_37;
152 case QUIC_VERSION_38: 152 case QUIC_VERSION_38:
153 return HttpResponseInfo::CONNECTION_INFO_QUIC_38; 153 return HttpResponseInfo::CONNECTION_INFO_QUIC_38;
154 case QUIC_VERSION_39:
155 return HttpResponseInfo::CONNECTION_INFO_QUIC_39;
154 } 156 }
155 NOTREACHED(); 157 NOTREACHED();
156 return HttpResponseInfo::CONNECTION_INFO_QUIC_UNKNOWN_VERSION; 158 return HttpResponseInfo::CONNECTION_INFO_QUIC_UNKNOWN_VERSION;
157 } 159 }
158 160
159 int QuicHttpStream::InitializeStream(const HttpRequestInfo* request_info, 161 int QuicHttpStream::InitializeStream(const HttpRequestInfo* request_info,
160 RequestPriority priority, 162 RequestPriority priority,
161 const NetLogWithSource& stream_net_log, 163 const NetLogWithSource& stream_net_log,
162 const CompletionCallback& callback) { 164 const CompletionCallback& callback) {
163 CHECK(callback_.is_null()); 165 CHECK(callback_.is_null());
(...skipping 725 matching lines...) Expand 10 before | Expand all | Expand 10 after
889 if (!response_headers_received_ && 891 if (!response_headers_received_ &&
890 http_server_properties_->IsAlternativeServiceBroken(AlternativeService( 892 http_server_properties_->IsAlternativeServiceBroken(AlternativeService(
891 kProtoQUIC, server_id_.host(), server_id_.port()))) { 893 kProtoQUIC, server_id_.host(), server_id_.port()))) {
892 return ERR_QUIC_BROKEN_ERROR; 894 return ERR_QUIC_BROKEN_ERROR;
893 } 895 }
894 896
895 return ERR_QUIC_PROTOCOL_ERROR; 897 return ERR_QUIC_PROTOCOL_ERROR;
896 } 898 }
897 899
898 } // namespace net 900 } // namespace net
OLDNEW
« no previous file with comments | « net/http/http_response_info.cc ('k') | net/quic/core/congestion_control/bbr_sender_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698