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

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

Issue 1140153003: Disable 0RTT if server and origin have different hosts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove test subclass, inline Run method. Created 5 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
« no previous file with comments | « no previous file | net/quic/quic_stream_factory.h » ('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/http/http_stream_factory_impl_job.h" 5 #include "net/http/http_stream_factory_impl_job.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 789 matching lines...) Expand 10 before | Expand all | Expand 10 after
800 NOTREACHED(); 800 NOTREACHED();
801 // TODO(rch): support QUIC proxies for HTTPS urls. 801 // TODO(rch): support QUIC proxies for HTTPS urls.
802 return ERR_NOT_IMPLEMENTED; 802 return ERR_NOT_IMPLEMENTED;
803 } 803 }
804 HostPortPair destination = proxy_info_.is_quic() 804 HostPortPair destination = proxy_info_.is_quic()
805 ? proxy_info_.proxy_server().host_port_pair() 805 ? proxy_info_.proxy_server().host_port_pair()
806 : server_; 806 : server_;
807 bool secure_quic = using_ssl_ || proxy_info_.is_quic(); 807 bool secure_quic = using_ssl_ || proxy_info_.is_quic();
808 int rv = quic_request_.Request( 808 int rv = quic_request_.Request(
809 destination, secure_quic, request_info_.privacy_mode, 809 destination, secure_quic, request_info_.privacy_mode,
810 request_info_.method, net_log_, io_callback_); 810 origin_url_.host(), request_info_.method, net_log_, io_callback_);
811 if (rv == OK) { 811 if (rv == OK) {
812 using_existing_quic_session_ = true; 812 using_existing_quic_session_ = true;
813 } else { 813 } else {
814 // OK, there's no available QUIC session. Let |waiting_job_| resume 814 // OK, there's no available QUIC session. Let |waiting_job_| resume
815 // if it's paused. 815 // if it's paused.
816 if (waiting_job_) { 816 if (waiting_job_) {
817 waiting_job_->Resume(this); 817 waiting_job_->Resume(this);
818 waiting_job_ = NULL; 818 waiting_job_ = NULL;
819 } 819 }
820 } 820 }
(...skipping 722 matching lines...) Expand 10 before | Expand all | Expand 10 after
1543 if (connection_->socket()) { 1543 if (connection_->socket()) {
1544 ConnectionAttempts socket_attempts; 1544 ConnectionAttempts socket_attempts;
1545 connection_->socket()->GetConnectionAttempts(&socket_attempts); 1545 connection_->socket()->GetConnectionAttempts(&socket_attempts);
1546 request_->AddConnectionAttempts(socket_attempts); 1546 request_->AddConnectionAttempts(socket_attempts);
1547 } else { 1547 } else {
1548 request_->AddConnectionAttempts(connection_->connection_attempts()); 1548 request_->AddConnectionAttempts(connection_->connection_attempts());
1549 } 1549 }
1550 } 1550 }
1551 1551
1552 } // namespace net 1552 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | net/quic/quic_stream_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698