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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit d9aa69b40d859086239cbb399c2f4a6f40578fa8
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 14 17:56:17 2003 +0000

            Reviewed by Darin
    
    	Fix for this bug:
    
    	<rdar://problem/3095893>: Image Capture: "Build web page" doesn't work with Japanese folder name.
    
            * kwq/KWQKURL.mm:
            (KURL::getNSURL): Try UTF-8 first and fallback to ISO Latin-1 when creating an NSURL.
    	This will handle the two-byte character in file name case mentioned in the bug.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4823 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b737520..7229100 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2003-08-14  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Darin
+
+	Fix for this bug:
+
+	<rdar://problem/3095893>: Image Capture: "Build web page" doesn't work with Japanese folder name.
+
+        * kwq/KWQKURL.mm:
+        (KURL::getNSURL): Try UTF-8 first and fallback to ISO Latin-1 when creating an NSURL.
+	This will handle the two-byte character in file name case mentioned in the bug.
+
 2003-08-14  Darin Adler  <darin at apple.com>
 
         Reviewed by Ken.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b737520..7229100 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2003-08-14  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Darin
+
+	Fix for this bug:
+
+	<rdar://problem/3095893>: Image Capture: "Build web page" doesn't work with Japanese folder name.
+
+        * kwq/KWQKURL.mm:
+        (KURL::getNSURL): Try UTF-8 first and fallback to ISO Latin-1 when creating an NSURL.
+	This will handle the two-byte character in file name case mentioned in the bug.
+
 2003-08-14  Darin Adler  <darin at apple.com>
 
         Reviewed by Ken.
diff --git a/WebCore/kwq/KWQKURL.mm b/WebCore/kwq/KWQKURL.mm
index 0e9d6e6..4d96e67 100644
--- a/WebCore/kwq/KWQKURL.mm
+++ b/WebCore/kwq/KWQKURL.mm
@@ -1297,7 +1297,14 @@ NSURL *KURL::getNSURL() const
     const UInt8 *bytes = (const UInt8 *)(urlString.latin1());
     NSURL *result = nil;
     if (urlString.length() > 0) {
-        result = (NSURL *)CFURLCreateAbsoluteURLWithBytes(NULL, bytes, urlString.length(), kCFStringEncodingISOLatin1, NULL, TRUE);
+        // NOTE: We use UTF-8 here since this encoding is used when computing strings when returning URL components
+        // (e.g calls to NSURL -path). However, this function is not tolerant of illegal UTF-8 sequences, which
+        // could either be a malformed string or bytes in a different encoding, like shift-jis, so we fall back
+        // onto using ISO Latin 1 in those cases.
+        result = (NSURL *)CFURLCreateAbsoluteURLWithBytes(NULL, bytes, urlString.length(), kCFStringEncodingUTF8, NULL, TRUE);
+        if (!result) {
+            result = (NSURL *)CFURLCreateAbsoluteURLWithBytes(NULL, bytes, urlString.length(), kCFStringEncodingISOLatin1, NULL, TRUE);
+        }
         [result autorelease];
     }
     else {

-- 
WebKit Debian packaging