diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-05 14:07:46 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-05 14:07:46 +0000 |
| commit | 79ba2d8a26fe6c9b343c57fef57896a90baa3878 (patch) | |
| tree | 82cc3559b62a01744c72e82a483d30374478dd9e /chrome | |
| parent | c8a56e47ddfa3f17a64f15a88490fe5ffb12fc1e (diff) | |
| download | chromium_src-79ba2d8a26fe6c9b343c57fef57896a90baa3878.zip chromium_src-79ba2d8a26fe6c9b343c57fef57896a90baa3878.tar.gz chromium_src-79ba2d8a26fe6c9b343c57fef57896a90baa3878.tar.bz2 | |
net: Silently disable False Start when NetNanny is detected.
In r62209 we added code to detect ESET and NetNanny and to give users
instructions for disabling their HTTPS scanning. This was because these
products intercept Chrome's HTTPS connections and break because of False
Start.
NetNanny has been responsive to the issue and is rolling out a fix. In
the mean time, we silently disable False Start when NetNanny is detected
to give them time to update their users etc.
BUG=59798
TEST=Navigate to https://www.paypal.com on Windows with NetNanny installed.
http://codereview.chromium.org/4449003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65199 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/generated_resources.grd | 3 | ||||
| -rw-r--r-- | chrome/renderer/localized_error.cc | 12 |
2 files changed, 0 insertions, 15 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index f9c53f4..4614a69 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -5687,9 +5687,6 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_ERRORPAGES_HEADING_ESET_ANTI_VIRUS_SSL_INTERCEPTION" desc="Heading of the error page when we detect that ESET anti-virus is running and intercepting our HTTPS connections. 'ESET' is a product name and may be best left untranslated."> Cannot make secure connection because of ESET anti-virus </message> - <message name="IDS_ERRORPAGES_HEADING_NETNANNY_SSL_INTERCEPTION" desc="Heading of the error page when we detect that NetNanny is running and intercepting our HTTPS connections. 'NetNanny' is a product name and may be best left untranslated."> - Cannot make secure connection because of NetNanny - </message> <message name="IDS_ERRORPAGES_SUMMARY_NOT_AVAILABLE" desc="Summary in the error page when we can't connect to a site."> The webpage at <ph name="URL"><strong jscontent="failedUrl"></strong></ph> might be temporarily down or it may have moved permanently to a new web address. </message> diff --git a/chrome/renderer/localized_error.cc b/chrome/renderer/localized_error.cc index f507ddd..d1a01f8 100644 --- a/chrome/renderer/localized_error.cc +++ b/chrome/renderer/localized_error.cc @@ -31,8 +31,6 @@ static const char kWeakDHKeyLearnMoreUrl[] = "http://sites.google.com/a/chromium.org/dev/err_ssl_weak_server_ephemeral_dh_key"; static const char kESETLearnMoreUrl[] = "http://sites.google.com/a/chromium.org/dev/err_eset_anti_virus_ssl_interception"; -static const char kNetNannyLearnMoreUrl[] = - "http://sites.google.com/a/chromium.org/dev/err_netnanny_ssl_interception"; enum NAV_SUGGESTIONS { SUGGEST_NONE = 0, @@ -149,13 +147,6 @@ const LocalizedErrorMap net_error_options[] = { IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR, SUGGEST_LEARNMORE, }, - {net::ERR_NETNANNY_SSL_INTERCEPTION, - IDS_ERRORPAGES_TITLE_LOAD_FAILED, - IDS_ERRORPAGES_HEADING_NETNANNY_SSL_INTERCEPTION, - IDS_ERRORPAGES_SUMMARY_NETNANNY_SSL_INTERCEPTION, - IDS_ERRORPAGES_DETAILS_SSL_PROTOCOL_ERROR, - SUGGEST_LEARNMORE, - }, }; const LocalizedErrorMap http_error_options[] = { @@ -444,9 +435,6 @@ void LocalizedError::GetStrings(const WebKit::WebURLError& error, case net::ERR_ESET_ANTI_VIRUS_SSL_INTERCEPTION: learn_more_url = GURL(kESETLearnMoreUrl); break; - case net::ERR_NETNANNY_SSL_INTERCEPTION: - learn_more_url = GURL(kNetNannyLearnMoreUrl); - break; default: break; } |