diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-27 16:49:54 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-27 16:49:54 +0000 |
| commit | ec7a5a0958ecc05d5781d547fa6363b3cfab9050 (patch) | |
| tree | 0b18c35ee9a9d0909332493c804b5bb88b2bfab0 /content/browser/ssl/ssl_manager.cc | |
| parent | 38993d44ef144bbe779e4bb386275cd9a62395a7 (diff) | |
| download | chromium_src-ec7a5a0958ecc05d5781d547fa6363b3cfab9050.zip chromium_src-ec7a5a0958ecc05d5781d547fa6363b3cfab9050.tar.gz chromium_src-ec7a5a0958ecc05d5781d547fa6363b3cfab9050.tar.bz2 | |
Revert "net: make HSTS hosts use the normal SSL interstitials"
This reverts commit r102947. It broke the shared build, probably because of a
missing NET_EXPORT.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102950 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/ssl/ssl_manager.cc')
| -rw-r--r-- | content/browser/ssl/ssl_manager.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc index 83b4d66..6ae6fb9 100644 --- a/content/browser/ssl/ssl_manager.cc +++ b/content/browser/ssl/ssl_manager.cc @@ -24,12 +24,10 @@ // static void SSLManager::OnSSLCertificateError(ResourceDispatcherHost* rdh, net::URLRequest* request, - const net::SSLInfo& ssl_info, - bool is_hsts_host) { - DVLOG(1) << "OnSSLCertificateError() cert_error: " - << net::MapCertStatusToNetError(ssl_info.cert_status) - << " url: " << request->url().spec() - << " cert_status: " << std::hex << ssl_info.cert_status; + int cert_error, + net::X509Certificate* cert) { + DVLOG(1) << "OnSSLCertificateError() cert_error: " << cert_error + << " url: " << request->url().spec(); ResourceDispatcherHostRequestInfo* info = ResourceDispatcherHost::InfoForRequest(request); @@ -41,8 +39,8 @@ void SSLManager::OnSSLCertificateError(ResourceDispatcherHost* rdh, NewRunnableMethod(new SSLCertErrorHandler(rdh, request, info->resource_type(), - ssl_info, - is_hsts_host), + cert_error, + cert), &SSLCertErrorHandler::Dispatch)); } |