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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 0c1c874ffb0d1b8e35988ad714c11a3aca340d88
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 6 15:06:34 2002 +0000

    	* src/kwq/KWQKURL.mm: (KURL::KURL): If resolving a relative URL
    	fails, assume it's absolute and possibly malformed, rather than
    	appending it to the path of the previous URL. This fixes a
    	CPU-spinning hang that John and Richard found.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@701 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 0798345..8b68c4d 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-03-06  Maciej Stachowiak  <mjs at apple.com>
+
+	* src/kwq/KWQKURL.mm: (KURL::KURL): If resolving a relative URL
+	fails, assume it's absolute and possibly malformed, rather than
+	appending it to the path of the previous URL. This fixes a
+	CPU-spinning hang that John and Richard found.
+
 2002-03-05  Richard Williamson  <rjw at apple.com>
 
         Pass errors correctly to browser.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 0798345..8b68c4d 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2002-03-06  Maciej Stachowiak  <mjs at apple.com>
+
+	* src/kwq/KWQKURL.mm: (KURL::KURL): If resolving a relative URL
+	fails, assume it's absolute and possibly malformed, rather than
+	appending it to the path of the previous URL. This fixes a
+	CPU-spinning hang that John and Richard found.
+
 2002-03-05  Richard Williamson  <rjw at apple.com>
 
         Pass errors correctly to browser.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 0798345..8b68c4d 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2002-03-06  Maciej Stachowiak  <mjs at apple.com>
+
+	* src/kwq/KWQKURL.mm: (KURL::KURL): If resolving a relative URL
+	fails, assume it's absolute and possibly malformed, rather than
+	appending it to the path of the previous URL. This fixes a
+	CPU-spinning hang that John and Richard found.
+
 2002-03-05  Richard Williamson  <rjw at apple.com>
 
         Pass errors correctly to browser.
diff --git a/WebCore/kwq/KWQKURL.mm b/WebCore/kwq/KWQKURL.mm
index bcb13d8..c9445c1 100644
--- a/WebCore/kwq/KWQKURL.mm
+++ b/WebCore/kwq/KWQKURL.mm
@@ -301,9 +301,7 @@ KURL::KURL(const KURL &base, const QString &relative)
     } else {
 	CFURLRef relativeURL = CFURLCreateWithString(NULL, relative.getCFMutableString(), base.d->urlRef);
 	if (relativeURL == NULL) {
-	    d = base.d;
-	    copyOnWrite();
-	    setPath(d->sPath + relative);
+	    d = KWQRefPtr<KURL::KWQKURLPrivate>(new KURL::KWQKURLPrivate(relative));
 	} else {
 	    CFURLRef absoluteURL = CFURLCopyAbsoluteURL(relativeURL);
 	
diff --git a/WebCore/src/kwq/KWQKURL.mm b/WebCore/src/kwq/KWQKURL.mm
index bcb13d8..c9445c1 100644
--- a/WebCore/src/kwq/KWQKURL.mm
+++ b/WebCore/src/kwq/KWQKURL.mm
@@ -301,9 +301,7 @@ KURL::KURL(const KURL &base, const QString &relative)
     } else {
 	CFURLRef relativeURL = CFURLCreateWithString(NULL, relative.getCFMutableString(), base.d->urlRef);
 	if (relativeURL == NULL) {
-	    d = base.d;
-	    copyOnWrite();
-	    setPath(d->sPath + relative);
+	    d = KWQRefPtr<KURL::KWQKURLPrivate>(new KURL::KWQKURLPrivate(relative));
 	} else {
 	    CFURLRef absoluteURL = CFURLCopyAbsoluteURL(relativeURL);
 	

-- 
WebKit Debian packaging