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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit bd307a2920e3e3114a8b5e08a93a5129270fc2ea
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 18 16:10:08 2003 +0000

    	Fixed: <rdar://problem/3380418>: Ignore specified string encoding when constructing file, mailto and help URLs
    
            Reviewed by mjs, darin.
    
            * kwq/KWQKURL.mm:
            (KURL::KURL): store the URL string as UTF-8 when the URL is file, mailto and help.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4836 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 564c33c..7b3b5d2 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-08-15  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3380418>: Ignore specified string encoding when constructing file, mailto and help URLs
+
+        Reviewed by mjs, darin.
+
+        * kwq/KWQKURL.mm:
+        (KURL::KURL): store the URL string as UTF-8 when the URL is file, mailto and help.
+
 2003-08-17  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 564c33c..7b3b5d2 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-08-15  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3380418>: Ignore specified string encoding when constructing file, mailto and help URLs
+
+        Reviewed by mjs, darin.
+
+        * kwq/KWQKURL.mm:
+        (KURL::KURL): store the URL string as UTF-8 when the URL is file, mailto and help.
+
 2003-08-17  Darin Adler  <darin at apple.com>
 
         Reviewed by Maciej.
diff --git a/WebCore/kwq/KWQKURL.mm b/WebCore/kwq/KWQKURL.mm
index 4d96e67..b249b77 100644
--- a/WebCore/kwq/KWQKURL.mm
+++ b/WebCore/kwq/KWQKURL.mm
@@ -266,6 +266,28 @@ KURL::KURL(const KURL &base, const QString &relative, const QTextCodec *codec)
         strBuffer = 0;
         str = relative.ascii();
     } else {
+        // Always use UTF-8 if the protocol is file, mailto, or help because that's
+        // what these protocols expect.
+        if (codec) {
+            QString protocol;
+            for (uint i = 0; i < relative.length(); i++) {
+                char p = relative.at(i).latin1();
+                if (IS_PATH_SEGMENT_END_CHAR(p)) {
+                    break;
+                }
+                if (p == ':') {
+                    protocol = relative.left(i);
+                    break;
+                }
+            }
+            if (!protocol) {
+                protocol = base.protocol();
+            }
+            protocol = protocol.lower();
+            if (protocol == "file" || protocol == "mailto" || protocol == "help") {
+                codec = NULL;
+            }
+        }
         QCString decoded = codec ? codec->fromUnicode(relative)
             : QTextCodec(kCFStringEncodingUTF8).fromUnicode(relative);
         strBuffer = strdup(decoded);

-- 
WebKit Debian packaging