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

Unified Diff: net/http/http_stream_factory_impl_job.cc

Issue 17247006: Fix QUIC alternate protocol behavior so that that main job does not wait (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test Created 7 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | net/quic/quic_client_session.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_stream_factory_impl_job.cc
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc
index 179d8c458324ae8975216e22cbbf746885faff40..5ee8c3be0916349996c6171c7dfc14f38a6f8fc8 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -704,8 +704,17 @@ int HttpStreamFactoryImpl::Job::DoInitConnection() {
}
next_state_ = STATE_INIT_CONNECTION_COMPLETE;
const ProxyServer& proxy_server = proxy_info_.proxy_server();
- return quic_request_.Request(HostPortProxyPair(origin_, proxy_server),
- net_log_, io_callback_);
+ int rv = quic_request_.Request(HostPortProxyPair(origin_, proxy_server),
+ net_log_, io_callback_);
+ if (rv != OK) {
+ // OK, there's no available QUIC session. Let |waiting_job_| resume
+ // if it's paused.
+ if (waiting_job_) {
+ waiting_job_->Resume(this);
+ waiting_job_ = NULL;
+ }
+ }
+ return rv;
}
// Check first if we have a spdy session for this group. If so, then go
« no previous file with comments | « no previous file | net/quic/quic_client_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698