| 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.
|
|
|