[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 9fcb56c5ab2ccced2b9c328dc08d743c98b0ffe8
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 6 07:03:21 2002 +0000

            Reviewed by Don.
    
    	- fixed 3116149 -- REGRESSION: assert on invalid encoding trying to show accuweather.com source
    
    	The regression was caused when we updated the View Source window to try to get the encoding right.
    
            * kwq/WebCoreBridge.mm: (+[WebCoreBridge stringWithData:textEncoding:]):
    	Make this function decode the string as Windows Latin-1 if the passed-in encoding is
    	invalid or ISO Latin-1, since that's what we always want.
    
            * kwq/mac-encodings.txt: Add "8859_1" since we have now seen it "in the wild".
            * kwq/KWQCharsetData.c: Check in new version of generated file.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2956 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 046c3dd..82c3159 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,18 @@
+2002-12-05  Darin Adler  <darin at apple.com>
+
+        Reviewed by Don.
+
+	- fixed 3116149 -- REGRESSION: assert on invalid encoding trying to show accuweather.com source
+
+	The regression was caused when we updated the View Source window to try to get the encoding right.
+
+        * kwq/WebCoreBridge.mm: (+[WebCoreBridge stringWithData:textEncoding:]):
+	Make this function decode the string as Windows Latin-1 if the passed-in encoding is
+	invalid or ISO Latin-1, since that's what we always want.
+
+        * kwq/mac-encodings.txt: Add "8859_1" since we have now seen it "in the wild".
+        * kwq/KWQCharsetData.c: Check in new version of generated file.
+
 2002-12-05  David Hyatt  <hyatt at apple.com>
 
 	Fix for javadoc page.  It specified an invalid unit, and our
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 046c3dd..82c3159 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2002-12-05  Darin Adler  <darin at apple.com>
+
+        Reviewed by Don.
+
+	- fixed 3116149 -- REGRESSION: assert on invalid encoding trying to show accuweather.com source
+
+	The regression was caused when we updated the View Source window to try to get the encoding right.
+
+        * kwq/WebCoreBridge.mm: (+[WebCoreBridge stringWithData:textEncoding:]):
+	Make this function decode the string as Windows Latin-1 if the passed-in encoding is
+	invalid or ISO Latin-1, since that's what we always want.
+
+        * kwq/mac-encodings.txt: Add "8859_1" since we have now seen it "in the wild".
+        * kwq/KWQCharsetData.c: Check in new version of generated file.
+
 2002-12-05  David Hyatt  <hyatt at apple.com>
 
 	Fix for javadoc page.  It specified an invalid unit, and our
diff --git a/WebCore/kwq/KWQCharsetData.c b/WebCore/kwq/KWQCharsetData.c
index 4a44954..93ab864 100644
--- a/WebCore/kwq/KWQCharsetData.c
+++ b/WebCore/kwq/KWQCharsetData.c
@@ -6,6 +6,7 @@ static const CharsetEntry table[] = {
     { "windows-1252", 2252, kCFStringEncodingWindowsLatin1 },
     { "winlatin1", 2252, kCFStringEncodingWindowsLatin1 },
     { "x-ansi", 2252, kCFStringEncodingWindowsLatin1 },
+    { "8859_1", 4, kCFStringEncodingISOLatin1 },
     { "cp819", 4, kCFStringEncodingISOLatin1 },
     { "csisolatin1", 4, kCFStringEncodingISOLatin1 },
     { "ibm819", 4, kCFStringEncodingISOLatin1 },
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 1274114..78d98fd 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -879,6 +879,9 @@ DOM::Node next = n.firstChild();
 
 + (NSString *)stringWithData:(NSData *)data textEncoding:(CFStringEncoding)textEncoding
 {
+    if (textEncoding == kCFStringEncodingInvalidId || textEncoding == kCFStringEncodingISOLatin1) {
+        textEncoding = kCFStringEncodingWindowsLatin1;
+    }
     QString string = QString::fromStringWithEncoding((const char*)[data bytes], [data length], textEncoding);
     return string.getNSString();
 }
diff --git a/WebCore/kwq/mac-encodings.txt b/WebCore/kwq/mac-encodings.txt
index cc083e0..61cdd3a 100644
--- a/WebCore/kwq/mac-encodings.txt
+++ b/WebCore/kwq/mac-encodings.txt
@@ -5,7 +5,7 @@
 
 MacRoman: macintosh, x-mac-roman
 WindowsLatin1: windows-1252, winlatin1, x-ansi
-ISOLatin1: iso-8859-1, iso8859-1
+ISOLatin1: 8859_1, iso-8859-1, iso8859-1
 NextStepLatin: x-nextstep
 ASCII: iso-ir-6us, us-ascii
 Unicode: iso-10646-ucs-2 # utf-16be, unicodeFFFE, unicode? (would adding these help us?)

-- 
WebKit Debian packaging