summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-27 16:44:15 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-27 16:44:15 +0000
commit144ebaf3f81bf5daea8f13e5c3c5d8217fdd340f (patch)
tree051de573ee9c8326a289d95c65a00d6db3171f88 /net
parent5a40f6beda09a0f259c7c4b7aa249e26612c5285 (diff)
downloadchromium_src-144ebaf3f81bf5daea8f13e5c3c5d8217fdd340f.zip
chromium_src-144ebaf3f81bf5daea8f13e5c3c5d8217fdd340f.tar.gz
chromium_src-144ebaf3f81bf5daea8f13e5c3c5d8217fdd340f.tar.bz2
Add CHECKs to help track down the crash in http://crbug.com/49862.
R=vandebo BUG=49862 TEST=none Review URL: http://codereview.chromium.org/3072003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53794 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/http/http_network_transaction.cc5
-rw-r--r--net/socket/ssl_client_socket_nss.cc2
2 files changed, 6 insertions, 1 deletions
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index 749ab33..789170a 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -907,8 +907,11 @@ int HttpNetworkTransaction::DoInitConnectionComplete(int result) {
return OK;
}
- if (result < 0 && !ssl_started)
+ if (result < 0 && !ssl_started) {
+ // A temporary CHECK for tracking down http://crbug.com/49862.
+ CHECK(!IsCertificateError(result));
return ReconsiderProxyAfterError(result);
+ }
establishing_tunnel_ = false;
if (connection_->socket()) {
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
index bbbfaab..62af6f8 100644
--- a/net/socket/ssl_client_socket_nss.cc
+++ b/net/socket/ssl_client_socket_nss.cc
@@ -768,6 +768,8 @@ void SSLClientSocketNSS::CheckSecureRenegotiation() const {
void SSLClientSocketNSS::GetSSLInfo(SSLInfo* ssl_info) {
EnterFunction("");
ssl_info->Reset();
+ // A temporary CHECK for tracking down http://crbug.com/49862.
+ CHECK(server_cert_);
if (!server_cert_)
return;