Changeset 24777 in webkit

Timestamp:

Jul 30, 2007 10:28:03 AM (17 years ago)

Author:

andersca

Message:

Reviewed by Darin.

<rdar://problem/4942372> REGRESSION: Anchor links in Mail don't work anymore

Make it possible for KURL to handle addig fragments to non-hierarchical URLs
such as mailto: and cid:.

• platform/KURL.cpp: (WebCore::KURL::init): If the base URL is not hierarchical but the relative URL is a fragment, then allow parsing it.

(WebCore::KURL::parse):
If the URL is not hierarchical, set the fragment start and end positions correctly.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/KURL.cpp (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-07-30  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Darin.
+
+        <rdar://problem/4942372> REGRESSION: Anchor links in Mail don't work anymore
+        
+        Make it possible for KURL to handle addig fragments to non-hierarchical URLs
+        such as mailto: and cid:.
+    
+        * platform/KURL.cpp:
+        (WebCore::KURL::init):
+        If the base URL is not hierarchical but the relative URL is a fragment, then 
+        allow parsing it.
+        
+        (WebCore::KURL::parse):
+        If the URL is not hierarchical, set the fragment start and end positions correctly.
+
 2007-07-30  Simon Hausmann  <hausmann@kde.org>
 

trunk/WebCore/platform/KURL.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2004 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2004, 2007 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -11 +11 @@
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
@@ -349 +349 @@
         parse(str, (allASCII && !strippedStart && (charsToChopOffEnd == 0)) ? &rel : 0);
     } else {
-        // If the base is empty or opaque (e.g. data: or javascript:), then the URL is invalid.
+        // If the base is empty or opaque (e.g. data: or javascript:), then the URL is invalid
+        // unless the relative URL is a single fragment.
         if (!base.isHierarchical()) {
-            m_isValid = false;
+            if (str[0] == '#') {
+                DeprecatedString newURL = base.urlString.left(base.queryEndPos) + str;
+                parse(newURL.ascii(), &newURL);
+            } else
+                m_isValid = false;
+            
             if (strBuffer)
                 fastFree(strBuffer);
@@ -1054 +1060 @@
 
     if (!hierarchical) {
-        while (url[pathEnd] != '\0' && url[pathEnd] != '?') {
+        while (url[pathEnd] != '\0' && url[pathEnd] != '?' && url[pathEnd] != '#')
             pathEnd++;
-        }
-        queryStart = queryEnd = pathEnd;
-
-        while (url[queryEnd] != '\0') {
-            queryEnd++;
-        }
-
-        fragmentStart = fragmentEnd = queryEnd;
+        
+        queryStart = pathEnd;
+        queryEnd = queryStart;
+        if (url[queryStart] == '?') {
+            while (url[queryEnd] != '\0' && url[queryEnd] != '#')
+                queryEnd++;
+        }
+        
+        fragmentStart = queryEnd;
+        fragmentEnd = fragmentStart;
+        if (url[fragmentStart] == '#') {
+            fragmentStart++;
+            fragmentEnd = fragmentStart;
+            while (url[fragmentEnd] != '\0')
+                fragmentEnd++;
+        }        
     }
     else {
@@ -1083 +1097 @@
             fragmentStart++;
             fragmentEnd = fragmentStart;
-            while(url[fragmentEnd] != '\0') {
+            while (url[fragmentEnd] != '\0') {
                 fragmentEnd++;
             }