[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 8c6ffe7d7d54725d99223ead0a51e6d5e0461f55
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 23 17:28:44 2002 +0000

    	Got the kurl-test in the Tests directory working again.
    
            * kwq/KWQKURL.mm: (KURL::KURL): Fixed problem where relative path resolution code
    	for "../" could eat up the host name too, treating it as part of the path.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1910 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 5d2cbb8..3919ee0 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,12 @@
 2002-08-23  Darin Adler  <darin at apple.com>
 
+	Got the kurl-test in the Tests directory working again.
+
+        * kwq/KWQKURL.mm: (KURL::KURL): Fixed problem where relative path resolution code
+	for "../" could eat up the host name too, treating it as part of the path.
+
+2002-08-23  Darin Adler  <darin at apple.com>
+
 	- fixed 3032058 -- Links on local developer doc pages all broken (all local files?)
 
         * kwq/KWQKURL.mm: (KURL::getNSURL): Re-added a workaround for CFURL bug 2908969.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 5d2cbb8..3919ee0 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,12 @@
 2002-08-23  Darin Adler  <darin at apple.com>
 
+	Got the kurl-test in the Tests directory working again.
+
+        * kwq/KWQKURL.mm: (KURL::KURL): Fixed problem where relative path resolution code
+	for "../" could eat up the host name too, treating it as part of the path.
+
+2002-08-23  Darin Adler  <darin at apple.com>
+
 	- fixed 3032058 -- Links on local developer doc pages all broken (all local files?)
 
         * kwq/KWQKURL.mm: (KURL::getNSURL): Re-added a workaround for CFURL bug 2908969.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5d2cbb8..3919ee0 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,12 @@
 2002-08-23  Darin Adler  <darin at apple.com>
 
+	Got the kurl-test in the Tests directory working again.
+
+        * kwq/KWQKURL.mm: (KURL::KURL): Fixed problem where relative path resolution code
+	for "../" could eat up the host name too, treating it as part of the path.
+
+2002-08-23  Darin Adler  <darin at apple.com>
+
 	- fixed 3032058 -- Links on local developer doc pages all broken (all local files?)
 
         * kwq/KWQKURL.mm: (KURL::getNSURL): Re-added a workaround for CFURL bug 2908969.
diff --git a/WebCore/kwq/KWQKURL.mm b/WebCore/kwq/KWQKURL.mm
index d54187b..aeee00a 100644
--- a/WebCore/kwq/KWQKURL.mm
+++ b/WebCore/kwq/KWQKURL.mm
@@ -315,6 +315,7 @@ KURL::KURL(const KURL &base, const QString &relative)
 		while (baseStringStart < pathStart) {
 		    *bufferPos++ = *baseStringStart++;
 		}
+                char *bufferPathStart = bufferPos;
 
 		// now copy the base path 
 		const char *baseStringEnd = baseString + base.pathEndPos;
@@ -339,10 +340,10 @@ KURL::KURL(const KURL &base, const QString &relative)
 			    // ".." segments - we choose to drop them since some web content
 			    // relies on this.
 			    baseStringPos += 3;
-			    if (bufferPos > buffer + 1) {
+			    if (bufferPos > bufferPathStart + 1) {
 				bufferPos--;
 			    }
-			    while (bufferPos > buffer && bufferPos[-1] != '/') {
+			    while (bufferPos > bufferPathStart && bufferPos[-1] != '/') {
 				bufferPos--;
 			    }
 			    // don't strip the slash before the last path segment if it was the final one
@@ -379,10 +380,10 @@ KURL::KURL(const KURL &base, const QString &relative)
 			    if (relStringPos[0] == '/') {
 				relStringPos++;
 			    }
-			    if (bufferPos > buffer + 1) {
+			    if (bufferPos > bufferPathStart + 1) {
 				bufferPos--;
 			    }
-			    while (bufferPos > buffer + 1  && bufferPos[-1] != '/') {
+			    while (bufferPos > bufferPathStart + 1  && bufferPos[-1] != '/') {
 				bufferPos--;
 			    }
 			    continue;

-- 
WebKit Debian packaging