diff options
author | wtc@google.com <wtc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-08 18:25:50 +0000 |
---|---|---|
committer | wtc@google.com <wtc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-08 18:25:50 +0000 |
commit | 9fb0a704e6b2d018fa3988e25f00df3963b25cc4 (patch) | |
tree | 50c967ab4ae037937cf6eb691e07e43e013df152 /net | |
parent | 4742831eddddff9f2b7aa506861e3c2af3ea73f7 (diff) | |
download | chromium_src-9fb0a704e6b2d018fa3988e25f00df3963b25cc4.zip chromium_src-9fb0a704e6b2d018fa3988e25f00df3963b25cc4.tar.gz chromium_src-9fb0a704e6b2d018fa3988e25f00df3963b25cc4.tar.bz2 |
Use the new HTTP stack by default in the net module's
tests, but continue to use WinHTTP by default in the
test shell and chrome.
The mapping of CRYPT_E_NO_REVOCATION_CHECK to
ERR_CERT_NO_REVOCATION_MECHANISM (a certificate error
code) is necessary to make the HTTPSTestServer's start
and shutdown GET commands work. (The TestDelegate
ignores all certificate errors.)
R=darin
Review URL: http://codereview.chromium.org/6472
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3022 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r-- | net/base/ssl_client_socket.cc | 2 | ||||
-rw-r--r-- | net/http/http_network_layer.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/net/base/ssl_client_socket.cc b/net/base/ssl_client_socket.cc index 3d576af..6341db1 100644 --- a/net/base/ssl_client_socket.cc +++ b/net/base/ssl_client_socket.cc @@ -32,6 +32,8 @@ static int MapSecurityError(SECURITY_STATUS err) { case SEC_E_CERT_EXPIRED: // Schannel case CERT_E_EXPIRED: // CryptoAPI return ERR_CERT_DATE_INVALID; + case CRYPT_E_NO_REVOCATION_CHECK: + return ERR_CERT_NO_REVOCATION_MECHANISM; case CRYPT_E_REVOKED: // Schannel and CryptoAPI return ERR_CERT_REVOKED; case SEC_E_CERT_UNKNOWN: diff --git a/net/http/http_network_layer.cc b/net/http/http_network_layer.cc index 9b2c468..8c504fc 100644 --- a/net/http/http_network_layer.cc +++ b/net/http/http_network_layer.cc @@ -20,7 +20,7 @@ namespace net { #if defined(OS_WIN) // static -bool HttpNetworkLayer::use_winhttp_ = true; +bool HttpNetworkLayer::use_winhttp_ = false; #endif // static |