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

[trey]

The following commit has been merged in the debian/unstable branch:
commit 2b997f8d48bcc03d4d1c7875c5cace8a89079a70
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 22 05:02:25 2003 +0000

    	3121681 - "localhost" part of link is lost with relative links
    
    	Was broken for abs links with localhost too.  Solution is to tighten up the test
    	for "localhost" removal to only apply to file urls.
    	canonical result.
    
            Reviewed by Maciej.
    
            * kwq/KWQKURL.mm:
            (KURL::parse):  Allow the authority processing even for links with
    	localhost.  Only cut out the addition of host for locahost file links.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3393 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 90b1ff2..1e82a44 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,17 @@
+2003-01-21  Trey Matteson  <trey at apple.com>
+
+	3121681 - "localhost" part of link is lost with relative links
+
+	Was broken for abs links with localhost too.  Solution is to tighten up the test
+	for "localhost" removal to only apply to file urls.
+	canonical result.
+
+        Reviewed by Maciej.
+
+        * kwq/KWQKURL.mm:
+        (KURL::parse):  Allow the authority processing even for links with
+	localhost.  Only cut out the addition of host for locahost file links.
+
 2003-01-21  David Hyatt  <hyatt at apple.com>
 
 	Fix nodeAtPoint to return text nodes if the mouse is over them.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 90b1ff2..1e82a44 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,17 @@
+2003-01-21  Trey Matteson  <trey at apple.com>
+
+	3121681 - "localhost" part of link is lost with relative links
+
+	Was broken for abs links with localhost too.  Solution is to tighten up the test
+	for "localhost" removal to only apply to file urls.
+	canonical result.
+
+        Reviewed by Maciej.
+
+        * kwq/KWQKURL.mm:
+        (KURL::parse):  Allow the authority processing even for links with
+	localhost.  Only cut out the addition of host for locahost file links.
+
 2003-01-21  David Hyatt  <hyatt at apple.com>
 
 	Fix nodeAtPoint to return text nodes if the mouse is over them.
diff --git a/WebCore/kwq/KWQKURL.mm b/WebCore/kwq/KWQKURL.mm
index ed551da..e275525 100644
--- a/WebCore/kwq/KWQKURL.mm
+++ b/WebCore/kwq/KWQKURL.mm
@@ -997,12 +997,13 @@ void KURL::parse(const char *url, const QString *originalString)
         && tolower(url[userStart+8]) == 't';
     
     bool haveNonHostAuthorityPart = userStart != userEnd || passwordStart != passwordEnd || portStart != portEnd;
-    
-    // add ";"
+
+    // add ":" after scheme
     *p++ = ':';
 
     // if we have at least one authority part or a file URL - add "//"
-    if (isFILENeedsHostPart || ((haveNonHostAuthorityPart || hostStart != hostEnd) && !hostIsLocalHost)) {
+    if (isFILENeedsHostPart || haveNonHostAuthorityPart || hostStart != hostEnd)
+    {
 	*p++ = '/';
 	*p++ = '/';
 
@@ -1032,8 +1033,8 @@ void KURL::parse(const char *url, const QString *originalString)
 	    *p++ = '@';
 	}
 	
-	// copy in the host
-	if (!isFILENeedsHostPart || !hostIsLocalHost || haveNonHostAuthorityPart) {
+	// copy in the host, except in the case of a file URL with authority="localhost"
+	if (!(isFILENeedsHostPart && hostIsLocalHost && !haveNonHostAuthorityPart)) {
             strPtr = url + hostStart;
             const char *hostEndPtr = url + hostEnd;
             while (strPtr < hostEndPtr) {

-- 
WebKit Debian packaging