Changeset 57923 in webkit

Timestamp:

Apr 20, 2010 2:50:32 PM (14 years ago)

Author:

timothy@apple.com

Message:

Fix matching of "​file:///*" patterns by not trying to compare the host. The host is
irrelevant for file URLs.

Also fix comparisons to be case insensitive.

​https://bugs.webkit.org/show_bug.cgi?id=37889

Reviewed by Dave Hyatt.

• page/UserContentURLPattern.cpp:

(WebCore::UserContentURLPattern::parse): Use equalIgnoringCase when comparing for "file" schemes.
(WebCore::UserContentURLPattern::matches): Use equalIgnoringCase when comparing schemes. Only call
matchesHost if the scheme isn't "file".
(WebCore::UserContentURLPattern::matchesHost): Call equalIgnoringCase when comparing hosts. The endsWith
was already doing a case-insensitive compare, so existing tests worked though this path.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/UserContentURLPattern.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-20  Timothy Hatcher  <timothy@apple.com>
+
+        Fix matching of "file:///*" patterns by not trying to compare the host. The host is
+        irrelevant for file URLs.
+
+        Also fix comparisons to be case insensitive.
+
+        https://bugs.webkit.org/show_bug.cgi?id=37889
+
+        Reviewed by Dave Hyatt.
+
+        * page/UserContentURLPattern.cpp:
+        (WebCore::UserContentURLPattern::parse): Use equalIgnoringCase when comparing for "file" schemes.
+        (WebCore::UserContentURLPattern::matches): Use equalIgnoringCase when comparing schemes. Only call
+        matchesHost if the scheme isn't "file".
+        (WebCore::UserContentURLPattern::matchesHost): Call equalIgnoringCase when comparing hosts. The endsWith
+        was already doing a case-insensitive compare, so existing tests worked though this path.
+
 2010-04-20  Justin Schuh  <jschuh@chromium.org>
 

trunk/WebCore/page/UserContentURLPattern.cpp

@@ -76 +76 @@
     int pathStartPos = 0;
 
-    if (m_scheme == "file")
+    if (equalIgnoringCase(m_scheme, "file"))
         pathStartPos = hostStartPos;
     else {
@@ -115 +115 @@
         return false;
 
-    if (test.protocol() != m_scheme)
-        return false;
-
-    if (!matchesHost(test))
+    if (!equalIgnoringCase(test.protocol(), m_scheme))
+        return false;
+
+    if (!equalIgnoringCase(m_scheme, "file") && !matchesHost(test))
         return false;
 
@@ -126 +126 @@
 bool UserContentURLPattern::matchesHost(const KURL& test) const
 {
-    if (test.host() == m_host)
+    if (equalIgnoringCase(test.host(), m_host))
         return true;