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

Side by Side Diff: net/http/http_network_transaction.cc

Issue 1904483004: Change SupportsSpdy dict, SpdySettingsMap, ServerNetworkStatsMap, AlternativeServiceMap and disk da… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix compile after sync code, introduced by commit 388755 Created 4 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
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/http/http_network_transaction.h" 5 #include "net/http/http_network_transaction.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 1230 matching lines...) Expand 10 before | Expand all | Expand 10 after
1241 // a 1xx that isn't a 100 is rare). 1241 // a 1xx that isn't a 100 is rare).
1242 // Unless this is a WebSocket request, in which case we pass it on up. 1242 // Unless this is a WebSocket request, in which case we pass it on up.
1243 if (response_.headers->response_code() / 100 == 1 && 1243 if (response_.headers->response_code() / 100 == 1 &&
1244 !ForWebSocketHandshake()) { 1244 !ForWebSocketHandshake()) {
1245 response_.headers = new HttpResponseHeaders(std::string()); 1245 response_.headers = new HttpResponseHeaders(std::string());
1246 next_state_ = STATE_READ_HEADERS; 1246 next_state_ = STATE_READ_HEADERS;
1247 return OK; 1247 return OK;
1248 } 1248 }
1249 1249
1250 session_->http_stream_factory()->ProcessAlternativeServices( 1250 session_->http_stream_factory()->ProcessAlternativeServices(
1251 session_, response_.headers.get(), HostPortPair::FromURL(request_->url)); 1251 session_, response_.headers.get(), url::SchemeHostPort(request_->url));
1252 1252
1253 if (IsSecureRequest()) 1253 if (IsSecureRequest())
1254 stream_->GetSSLInfo(&response_.ssl_info); 1254 stream_->GetSSLInfo(&response_.ssl_info);
1255 1255
1256 int rv = HandleAuthChallenge(); 1256 int rv = HandleAuthChallenge();
1257 if (rv != OK) 1257 if (rv != OK)
1258 return rv; 1258 return rv;
1259 1259
1260 headers_valid_ = true; 1260 headers_valid_ = true;
1261 return OK; 1261 return OK;
(...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after
1804 DCHECK(stream_request_); 1804 DCHECK(stream_request_);
1805 1805
1806 // Since the transaction can restart with auth credentials, it may create a 1806 // Since the transaction can restart with auth credentials, it may create a
1807 // stream more than once. Accumulate all of the connection attempts across 1807 // stream more than once. Accumulate all of the connection attempts across
1808 // those streams by appending them to the vector: 1808 // those streams by appending them to the vector:
1809 for (const auto& attempt : stream_request_->connection_attempts()) 1809 for (const auto& attempt : stream_request_->connection_attempts())
1810 connection_attempts_.push_back(attempt); 1810 connection_attempts_.push_back(attempt);
1811 } 1811 }
1812 1812
1813 } // namespace net 1813 } // namespace net
OLDNEW
« no previous file with comments | « net/http/bidirectional_stream_unittest.cc ('k') | net/http/http_network_transaction_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698