diff options
| author | palmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-21 18:37:16 +0000 |
|---|---|---|
| committer | palmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-21 18:37:16 +0000 |
| commit | 4e84d5e0e23d07f4491afc3d4912be4c33531738 (patch) | |
| tree | 7efc68ce9f6f9de9f57db2c475b8bccd0bdcefb7 | |
| parent | c7b9c34b9934b7ba66d2d61deccc0b0ac9a62c26 (diff) | |
| download | chromium_src-4e84d5e0e23d07f4491afc3d4912be4c33531738.zip chromium_src-4e84d5e0e23d07f4491afc3d4912be4c33531738.tar.gz chromium_src-4e84d5e0e23d07f4491afc3d4912be4c33531738.tar.bz2 | |
Merge 229478 "Remove HSTS preload for translate.google.com."
> Remove HSTS preload for translate.google.com.
>
> Works around a server-side bug.
>
> BUG=309176
> TBR=rsleevi@chromium.org
>
> Review URL: https://codereview.chromium.org/28743003
TBR=palmer@chromium.org
Review URL: https://codereview.chromium.org/33393002
git-svn-id: svn://svn.chromium.org/chrome/branches/1650/src@229869 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/http/transport_security_state_static.h | 1 | ||||
| -rw-r--r-- | net/http/transport_security_state_static.json | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/net/http/transport_security_state_static.h b/net/http/transport_security_state_static.h index 36289cc..0257c0d 100644 --- a/net/http/transport_security_state_static.h +++ b/net/http/transport_security_state_static.h @@ -425,7 +425,6 @@ static const struct HSTSPreload kPreloadedSTS[] = { {19, true, "\006script\006google\003com", true, kGooglePins, DOMAIN_GOOGLE_COM }, {20, true, "\007history\006google\003com", true, kGooglePins, DOMAIN_GOOGLE_COM }, {21, true, "\010security\006google\003com", true, kGooglePins, DOMAIN_GOOGLE_COM }, - {22, true, "\011translate\006google\003com", true, kGooglePins, DOMAIN_GOOGLE_COM }, {20, true, "\006market\007android\003com", true, kGooglePins, DOMAIN_ANDROID_COM }, {26, true, "\003ssl\020google-analytics\003com", true, kGooglePins, DOMAIN_GOOGLE_ANALYTICS_COM }, {18, true, "\005drive\006google\003com", true, kGooglePins, DOMAIN_GOOGLE_COM }, diff --git a/net/http/transport_security_state_static.json b/net/http/transport_security_state_static.json index 8e8e7ee..47b5c08 100644 --- a/net/http/transport_security_state_static.json +++ b/net/http/transport_security_state_static.json @@ -186,7 +186,6 @@ { "name": "script.google.com", "include_subdomains": true, "mode": "force-https", "pins": "google" }, { "name": "history.google.com", "include_subdomains": true, "mode": "force-https", "pins": "google" }, { "name": "security.google.com", "include_subdomains": true, "mode": "force-https", "pins": "google" }, - { "name": "translate.google.com", "include_subdomains": true, "mode": "force-https", "pins": "google" }, // Other Google-related domains that must use HTTPS. { "name": "market.android.com", "include_subdomains": true, "mode": "force-https", "pins": "google" }, |