Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2765)

Unified Diff: Source/weborigin/OriginAccessEntry.cpp

Issue 50573004: Don't set document.domain to an IP address fragment. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: missing weboriginexport header Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/weborigin/OriginAccessEntry.h ('k') | Source/weborigin/SecurityPolicy.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/weborigin/OriginAccessEntry.cpp
diff --git a/Source/weborigin/OriginAccessEntry.cpp b/Source/weborigin/OriginAccessEntry.cpp
index 531877b813b935c4dd28e99c03b33d5630d69cc4..cc677f52b9a0804c4af7a68efaaa1c5f0f9bba18 100644
--- a/Source/weborigin/OriginAccessEntry.cpp
+++ b/Source/weborigin/OriginAccessEntry.cpp
@@ -35,10 +35,11 @@
namespace WebCore {
-OriginAccessEntry::OriginAccessEntry(const String& protocol, const String& host, SubdomainSetting subdomainSetting)
+OriginAccessEntry::OriginAccessEntry(const String& protocol, const String& host, SubdomainSetting subdomainSetting, IPAddressSetting ipAddressSetting)
: m_protocol(protocol.lower())
, m_host(host.lower())
, m_subdomainSettings(subdomainSetting)
+ , m_ipAddressSettings(ipAddressSetting)
{
ASSERT(subdomainSetting == AllowSubdomains || subdomainSetting == DisallowSubdomains);
@@ -67,7 +68,7 @@ bool OriginAccessEntry::matchesOrigin(const SecurityOrigin& origin) const
return false;
// Don't try to do subdomain matching on IP addresses.
- if (m_hostIsIPAddress)
+ if (m_hostIsIPAddress && m_ipAddressSettings == TreatIPAddressAsIPAddress)
return false;
// Match subdomains.
« no previous file with comments | « Source/weborigin/OriginAccessEntry.h ('k') | Source/weborigin/SecurityPolicy.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698