summaryrefslogtreecommitdiffstats
path: root/net/http
diff options
context:
space:
mode:
authorrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-22 23:49:30 +0000
committerrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-22 23:49:30 +0000
commitcebe328d5dd15f0ec5da3f11ec4b0d63a0ac9955 (patch)
tree9588234333f41050cb84f4fa7eb1078cd0951bf8 /net/http
parent02327a860914aafbcba8534a108c12f91bf1abde (diff)
downloadchromium_src-cebe328d5dd15f0ec5da3f11ec4b0d63a0ac9955.zip
chromium_src-cebe328d5dd15f0ec5da3f11ec4b0d63a0ac9955.tar.gz
chromium_src-cebe328d5dd15f0ec5da3f11ec4b0d63a0ac9955.tar.bz2
Fix bug in handling QUIC connections that error out early.
Review URL: https://chromiumcodereview.appspot.com/14951008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201639 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
-rw-r--r--net/http/http_stream_factory_impl_job.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc
index 5f15d8a..e93ca83 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -803,6 +803,8 @@ int HttpStreamFactoryImpl::Job::DoInitConnection() {
int HttpStreamFactoryImpl::Job::DoInitConnectionComplete(int result) {
if (IsPreconnecting()) {
+ if (using_quic_)
+ return result;
DCHECK_EQ(OK, result);
return OK;
}
@@ -903,6 +905,8 @@ int HttpStreamFactoryImpl::Job::DoInitConnectionComplete(int result) {
}
if (using_quic_) {
+ if (result < 0)
+ return result;
stream_ = quic_request_.ReleaseStream();
next_state_ = STATE_NONE;
return OK;