summaryrefslogtreecommitdiffstats
path: root/net/http
diff options
context:
space:
mode:
authorrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-11 07:28:58 +0000
committerrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-11 07:28:58 +0000
commit767a843bca3d789ff17677412b6a0ced0c8ef07d (patch)
tree6b54faac33d369c2094c323edd4e7957594b07e3 /net/http
parentd2a86be8ec201e74b227355400da4cd287e94e76 (diff)
downloadchromium_src-767a843bca3d789ff17677412b6a0ced0c8ef07d.zip
chromium_src-767a843bca3d789ff17677412b6a0ced0c8ef07d.tar.gz
chromium_src-767a843bca3d789ff17677412b6a0ced0c8ef07d.tar.bz2
Return ERR_PROXY_AUTH_REQUESTED_WITH_NO_CONNECTION instead of crashing
when PROXY_AUTH_REQUESTED is handled without a valid connection. BUG=362729 Review URL: https://codereview.chromium.org/324173003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276292 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
-rw-r--r--net/http/http_stream_factory_impl_job.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc
index 93b9ef2..fbbe969 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -475,7 +475,10 @@ int HttpStreamFactoryImpl::Job::RunLoop(int result) {
switch (result) {
case ERR_PROXY_AUTH_REQUESTED: {
- CHECK(connection_.get());
+ UMA_HISTOGRAM_BOOLEAN("Net.ProxyAuthRequested.HasConnection",
+ connection_.get() != NULL);
+ if (!connection_.get())
+ return ERR_PROXY_AUTH_REQUESTED_WITH_NO_CONNECTION;
CHECK(connection_->socket());
CHECK(establishing_tunnel_);