summaryrefslogtreecommitdiffstats
path: root/net/base
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-02 23:37:01 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-02 23:37:01 +0000
commit474bb2131c8bd9109fa33d034e3fa95da0eba228 (patch)
treee5489ba15b31b3e98485a622f97f7ec9ccdb3266 /net/base
parent721360a825f0cf5cf6cc247fcae1092a7741dda5 (diff)
downloadchromium_src-474bb2131c8bd9109fa33d034e3fa95da0eba228.zip
chromium_src-474bb2131c8bd9109fa33d034e3fa95da0eba228.tar.gz
chromium_src-474bb2131c8bd9109fa33d034e3fa95da0eba228.tar.bz2
Merge 120088 - net: add thepayplace.com to SSL blacklist
BUG=112328 TBR=agl@chromium.org Review URL: https://chromiumcodereview.appspot.com/9316081 git-svn-id: svn://svn.chromium.org/chrome/branches/1025/src@120252 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
-rw-r--r--net/base/ssl_false_start_blacklist.txt1
-rw-r--r--net/base/ssl_false_start_blacklist_unittest.cc1
2 files changed, 2 insertions, 0 deletions
diff --git a/net/base/ssl_false_start_blacklist.txt b/net/base/ssl_false_start_blacklist.txt
index 42eb925..85a6c35 100644
--- a/net/base/ssl_false_start_blacklist.txt
+++ b/net/base/ssl_false_start_blacklist.txt
@@ -1598,6 +1598,7 @@ thefushigi.com
thehexlightsite.com
themightysuperstore.com
thepalmwallet.com
+thepayplace.com
therockradionetwork.secure.myhosting.net
thesecuraoven.com
theshedd.org
diff --git a/net/base/ssl_false_start_blacklist_unittest.cc b/net/base/ssl_false_start_blacklist_unittest.cc
index 26c1976..9f25242 100644
--- a/net/base/ssl_false_start_blacklist_unittest.cc
+++ b/net/base/ssl_false_start_blacklist_unittest.cc
@@ -29,6 +29,7 @@ TEST(SSLFalseStartBlacklistTest, IsMember) {
EXPECT_TRUE(SSLFalseStartBlacklist::IsMember("www.toto-dream.com"));
EXPECT_TRUE(SSLFalseStartBlacklist::IsMember("billing.ntt-east.co.jp"));
+ EXPECT_TRUE(SSLFalseStartBlacklist::IsMember("thepayplace.com"));
}
} // namespace net