Written by Darin, reviewed by Maciej and me

        - change required to make previous checkin work with English language RSS pages

        * kwq/KWQKURL.h:
        new private method isHierarchical
        * kwq/KWQKURL.mm:
        (KURL::KURL):
        add hierarchical base URL check when determining whether the URL is absolute
        (KURL::isHierarchical):
        new method, returns true if this is a valid URL with a slash just past the scheme's trailing colon

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8604 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index cf5ff538b13a722ea508226dec47a4992ab40dcc..25fceca3fb8618a7bf89dd7d49438aa9a64bfda8 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2005-02-16  John Sullivan  <sullivan@apple.com>
+
+        Written by Darin, reviewed by Maciej and me
+        
+        - change required to make previous checkin work with English language RSS pages
+
+        * kwq/KWQKURL.h:
+        new private method isHierarchical
+        * kwq/KWQKURL.mm:
+        (KURL::KURL):
+        add hierarchical base URL check when determining whether the URL is absolute
+        (KURL::isHierarchical):
+        new method, returns true if this is a valid URL with a slash just past the scheme's trailing colon
+
 2005-02-16  John Sullivan  <sullivan@apple.com>
 
         Written by Darin, reviewed by me.

diff --git a/WebCore/kwq/KWQKURL.h b/WebCore/kwq/KWQKURL.h
index 5121aaa600331aa67abd5a687fae8c26812cf16b..1db2bd15809ff4e7d4a01cda1d33dc0fbb8bd03f 100644 (file)
--- a/WebCore/kwq/KWQKURL.h
+++ b/WebCore/kwq/KWQKURL.h
@@ -88,6 +88,7 @@ public:
     friend bool operator==(const KURL &, const KURL &);
 
 private:
+    bool isHierarchical() const;
     void parse(const char *url, const QString *originalString);
 
 #ifdef CONSTRUCT_CANONICAL_STRING

diff --git a/WebCore/kwq/KWQKURL.mm b/WebCore/kwq/KWQKURL.mm
index 854852b02ae67fa406efa7620e96253d04934eca..5b03110be1fe83e80738ea8b42b3c96c6cccd185 100644 (file)
--- a/WebCore/kwq/KWQKURL.mm
+++ b/WebCore/kwq/KWQKURL.mm
@@ -392,7 +392,7 @@ KURL::KURL(const KURL &base, const QString &relative, const QTextCodec *codec)
             ++p;
         }
         if (*p == ':') {
-            if (p[1] != '/' && base.protocol().lower() == QString(str, p - str).lower())
+            if (p[1] != '/' && base.protocol().lower() == QString(str, p - str).lower() && base.isHierarchical())
                 str = p + 1;
             else
                 absolute = true;
@@ -1748,3 +1748,11 @@ static QString substituteBackslashes(const QString &string)
 
     return string.left(pathEnd).replace('\\','/') + string.mid(pathEnd);
 }
+
+bool KURL::isHierarchical() const
+{
+    if (!m_isValid)
+        return false;
+    assert(urlString[schemeEndPos] == ':');
+    return urlString[schemeEndPos + 1] == '/';
+}