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

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

Issue 2109803002: Change a number of SPDY unittests from http to https. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 1198 matching lines...) Expand 10 before | Expand all | Expand 10 after
1209 // We treat any other 1xx in this same way (although in practice getting 1209 // We treat any other 1xx in this same way (although in practice getting
1210 // a 1xx that isn't a 100 is rare). 1210 // a 1xx that isn't a 100 is rare).
1211 // Unless this is a WebSocket request, in which case we pass it on up. 1211 // Unless this is a WebSocket request, in which case we pass it on up.
1212 if (response_.headers->response_code() / 100 == 1 && 1212 if (response_.headers->response_code() / 100 == 1 &&
1213 !ForWebSocketHandshake()) { 1213 !ForWebSocketHandshake()) {
1214 response_.headers = new HttpResponseHeaders(std::string()); 1214 response_.headers = new HttpResponseHeaders(std::string());
1215 next_state_ = STATE_READ_HEADERS; 1215 next_state_ = STATE_READ_HEADERS;
1216 return OK; 1216 return OK;
1217 } 1217 }
1218 1218
1219 if (session_->params().enable_alternative_service_for_insecure_origins || 1219 if (IsSecureRequest()) {
1220 IsSecureRequest()) {
1221 session_->http_stream_factory()->ProcessAlternativeServices( 1220 session_->http_stream_factory()->ProcessAlternativeServices(
1222 session_, response_.headers.get(), url::SchemeHostPort(request_->url)); 1221 session_, response_.headers.get(), url::SchemeHostPort(request_->url));
1223 } 1222 }
1224 1223
1225 if (IsSecureRequest()) 1224 if (IsSecureRequest())
1226 stream_->GetSSLInfo(&response_.ssl_info); 1225 stream_->GetSSLInfo(&response_.ssl_info);
1227 1226
1228 int rv = HandleAuthChallenge(); 1227 int rv = HandleAuthChallenge();
1229 if (rv != OK) 1228 if (rv != OK)
1230 return rv; 1229 return rv;
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
1664 DCHECK(stream_request_); 1663 DCHECK(stream_request_);
1665 1664
1666 // Since the transaction can restart with auth credentials, it may create a 1665 // Since the transaction can restart with auth credentials, it may create a
1667 // stream more than once. Accumulate all of the connection attempts across 1666 // stream more than once. Accumulate all of the connection attempts across
1668 // those streams by appending them to the vector: 1667 // those streams by appending them to the vector:
1669 for (const auto& attempt : stream_request_->connection_attempts()) 1668 for (const auto& attempt : stream_request_->connection_attempts())
1670 connection_attempts_.push_back(attempt); 1669 connection_attempts_.push_back(attempt);
1671 } 1670 }
1672 1671
1673 } // namespace net 1672 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698