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 /net/proxy/proxy_script_fetcher_impl.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 'net/proxy/proxy_script_fetcher_impl.cc')
| -rw-r--r-- | net/proxy/proxy_script_fetcher_impl.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/proxy/proxy_script_fetcher_impl.cc b/net/proxy/proxy_script_fetcher_impl.cc index bb0e57c..7025e72 100644 --- a/net/proxy/proxy_script_fetcher_impl.cc +++ b/net/proxy/proxy_script_fetcher_impl.cc @@ -9,7 +9,6 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/string_util.h" -#include "net/base/cert_status_flags.h" #include "net/base/data_url.h" #include "net/base/io_buffer.h" #include "net/base/load_flags.h" @@ -191,12 +190,12 @@ void ProxyScriptFetcherImpl::OnAuthRequired(URLRequest* request, } void ProxyScriptFetcherImpl::OnSSLCertificateError(URLRequest* request, - const SSLInfo& ssl_info, - bool is_hsts_host) { + int cert_error, + X509Certificate* cert) { DCHECK_EQ(request, cur_request_.get()); LOG(WARNING) << "SSL certificate error when fetching PAC script, aborting."; // Certificate errors are in same space as net errors. - result_code_ = MapCertStatusToNetError(ssl_info.cert_status); + result_code_ = cert_error; request->Cancel(); } |