[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 9964860c7db9f735d6e8672a6f642451679d4305
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jul 24 15:26:14 2002 +0000

    top level:
    
            * Tests/kde/kurl-test.cpp: (main): Added a test case for a relative URL with a
    	leading space in it.
            * Tests/kde/kurl-test.chk: Added the expected result.
    
    WebCore:
    
    	- fixed 3006329 - space should be stripped from beginning of relative url
    
            * kwq/KWQKURL.mm: (KURL::normalizeRelativeURLString): Added a call to stripWhiteSpace.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1652 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 1f6d9fc..0a7ec55 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-07-24  Darin Adler  <darin at apple.com>
+
+	- fixed 3006329 - space should be stripped from beginning of relative url
+
+        * kwq/KWQKURL.mm: (KURL::normalizeRelativeURLString): Added a call to stripWhiteSpace.
+
 2002-07-24  Maciej Stachowiak  <mjs at apple.com>
 
 	Made frame names globally unique, not just unique per parent frame
@@ -11,7 +17,7 @@
 
 2002-07-24  Darin Adler  <darin at apple.com>
 
-	- 3006336 -- crash in _NSDescriptionWithLocaleFunc
+	- fixed 3006336 -- crash in _NSDescriptionWithLocaleFunc
 
         * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::overURL):
 	Don't use the result of getNSString() on a C++ temporary object.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 1f6d9fc..0a7ec55 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2002-07-24  Darin Adler  <darin at apple.com>
+
+	- fixed 3006329 - space should be stripped from beginning of relative url
+
+        * kwq/KWQKURL.mm: (KURL::normalizeRelativeURLString): Added a call to stripWhiteSpace.
+
 2002-07-24  Maciej Stachowiak  <mjs at apple.com>
 
 	Made frame names globally unique, not just unique per parent frame
@@ -11,7 +17,7 @@
 
 2002-07-24  Darin Adler  <darin at apple.com>
 
-	- 3006336 -- crash in _NSDescriptionWithLocaleFunc
+	- fixed 3006336 -- crash in _NSDescriptionWithLocaleFunc
 
         * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::overURL):
 	Don't use the result of getNSString() on a C++ temporary object.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1f6d9fc..0a7ec55 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,9 @@
+2002-07-24  Darin Adler  <darin at apple.com>
+
+	- fixed 3006329 - space should be stripped from beginning of relative url
+
+        * kwq/KWQKURL.mm: (KURL::normalizeRelativeURLString): Added a call to stripWhiteSpace.
+
 2002-07-24  Maciej Stachowiak  <mjs at apple.com>
 
 	Made frame names globally unique, not just unique per parent frame
@@ -11,7 +17,7 @@
 
 2002-07-24  Darin Adler  <darin at apple.com>
 
-	- 3006336 -- crash in _NSDescriptionWithLocaleFunc
+	- fixed 3006336 -- crash in _NSDescriptionWithLocaleFunc
 
         * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::overURL):
 	Don't use the result of getNSString() on a C++ temporary object.
diff --git a/WebCore/kwq/KWQKURL.mm b/WebCore/kwq/KWQKURL.mm
index 7bdbcd4..ace9291 100644
--- a/WebCore/kwq/KWQKURL.mm
+++ b/WebCore/kwq/KWQKURL.mm
@@ -415,21 +415,22 @@ QString KURL::normalizeRelativeURLString(const KURL &base, const QString &relati
 	return QString::fromCFMutableString(cachedResult);
     }
     
+    QString stripped = relative.stripWhiteSpace();
     QString result;
-    if (relative.isEmpty()) {
+    if (stripped.isEmpty()) {
         result = base.urlString;
     } else {
         base.parse();
 
         CFStringRef relativeURLString = CFURLCreateStringByAddingPercentEscapes
-            (NULL, relative.getCFMutableString(), CFSTR("%#"), NULL, kCFStringEncodingUTF8);
+            (NULL, stripped.getCFMutableString(), CFSTR("%#"), NULL, kCFStringEncodingUTF8);
 
         CFURLRef relativeURL = CFURLCreateWithString(NULL, relativeURLString, base.d->urlRef);
 
         CFRelease(relativeURLString);
 
         if (relativeURL == NULL) {
-            result = normalizeURLString(relative);
+            result = normalizeURLString(stripped);
         } else {
             CFURLRef absoluteURL = CFURLCopyAbsoluteURL(relativeURL);
             

-- 
WebKit Debian packaging