[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 d689012d0923945c89df8c7ad4d33ead4417532c
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue May 13 20:40:57 2003 +0000

    Tests:
    
            Reviewed by Ken.
    
            * kde/kurl-test.chk: Update test results affected by the query changes.
    
            * kde/kurl-relative-test.chk: Update test results for recent changes (this test has been
            off for some time, so some changes were not that recent).
            * test.list: Turned kurl-relative-test back on.
    
    WebCore:
    
            Reviewed by Ken.
    
    	- fixed 3140822 -- relative URLs starting with query strings clobber path as the RFC says, but web says no
    
            * kwq/KWQKURL.mm: (KURL::KURL): Add a case for queries (as with anchors) to match
            the behavior of the web (albeit not the RFC).
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4362 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index bcc8ee2..9984d75 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -2,6 +2,15 @@
 
         Reviewed by Ken.
 
+	- fixed 3140822 -- relative URLs starting with query strings clobber path as the RFC says, but web says no
+
+        * kwq/KWQKURL.mm: (KURL::KURL): Add a case for queries (as with anchors) to match
+        the behavior of the web (albeit not the RFC).
+
+2003-05-13  Darin Adler  <darin at apple.com>
+
+        Reviewed by Ken.
+
 	- fixed 3120355 -- importing IE favorites garbles non-ASCII characters (esp. bad for non-Roman languages)
 
         * kwq/WebCoreEncodings.h: Added decodeData:, removed all other (unused) methods.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index bcc8ee2..9984d75 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -2,6 +2,15 @@
 
         Reviewed by Ken.
 
+	- fixed 3140822 -- relative URLs starting with query strings clobber path as the RFC says, but web says no
+
+        * kwq/KWQKURL.mm: (KURL::KURL): Add a case for queries (as with anchors) to match
+        the behavior of the web (albeit not the RFC).
+
+2003-05-13  Darin Adler  <darin at apple.com>
+
+        Reviewed by Ken.
+
 	- fixed 3120355 -- importing IE favorites garbles non-ASCII characters (esp. bad for non-Roman languages)
 
         * kwq/WebCoreEncodings.h: Added decodeData:, removed all other (unused) methods.
diff --git a/WebCore/kwq/KWQKURL.mm b/WebCore/kwq/KWQKURL.mm
index 1e8a6a5..6ccf40c 100644
--- a/WebCore/kwq/KWQKURL.mm
+++ b/WebCore/kwq/KWQKURL.mm
@@ -301,6 +301,13 @@ KURL::KURL(const KURL &base, const QString &relative, const QTextCodec *codec)
 		parse(newURL.ascii(), &newURL);
 		break;
 	    }
+	case '?':
+            // query-only reference, special case needed for non-URL results
+	    {
+		QString newURL = base.urlString.left(base.pathEndPos) + str;
+		parse(newURL.ascii(), &newURL);
+		break;
+	    }
 	case '/':
 	    // must be net-path or absolute-path reference
 	    {

-- 
WebKit Debian packaging