[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 414d8e4c077045f1125f65b35df1a188fd9bc347
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 24 19:21:01 2004 +0000

    Tests:
    
            * TestURLs.h: Update comment to reflect change in behavior.
            * kde/kurl-relative-test.chk: Update results to reflect "compatibility" result.
            * kde/kurl-test.chk: Update results to reflect "compatibility" result.
    
    WebCore:
    
            Reviewed by John.
    
            - fixed <rdar://problem/3599650>: main image missing due to incorrect relative URL resolution at www.brother.com
    
            * kwq/KWQKURL.mm: (KURL::KURL): Implement compatibility rule from the URI RFC.
            If a URL has a scheme, but does not start with the "/" character, and the scheme
            matches the base URL, then treat it as a relative URL.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6254 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 48739cb..09a9840 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-03-24  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+        - fixed <rdar://problem/3599650>: main image missing due to incorrect relative URL resolution at www.brother.com
+
+        * kwq/KWQKURL.mm: (KURL::KURL): Implement compatibility rule from the URI RFC.
+        If a URL has a scheme, but does not start with the "/" character, and the scheme
+        matches the base URL, then treat it as a relative URL.
+
 2004-03-24  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by me.
diff --git a/WebCore/kwq/KWQKURL.mm b/WebCore/kwq/KWQKURL.mm
index 83ea7aa..0bf172a 100644
--- a/WebCore/kwq/KWQKURL.mm
+++ b/WebCore/kwq/KWQKURL.mm
@@ -372,10 +372,13 @@ KURL::KURL(const KURL &base, const QString &relative, const QTextCodec *codec)
             ++p;
         }
         if (*p == ':') {
-            absolute = true;
+            if (p[1] != '/' && base.protocol().lower() == QString(str, p - str).lower())
+                str = p + 1;
+            else
+                absolute = true;
         }
     }
-        
+
     if (absolute) {
 	parse(str, allASCII ? &relative : 0);
     } else {

-- 
WebKit Debian packaging