[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 ac25937cff648611c9408a2c71158aa555906548
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Feb 8 07:14:09 2003 +0000

            Reviewed by Maciej.
    
            - fixed 3145899 -- tf1.fr page marked UTF-8 is being decoded as Latin-1 (due to <noscript> before <meta>)
    
            * khtml/misc/decoder.cpp: (Decoder::decode): Add NOSCRIPT to the list of tags
            that are allowed before META tags that specify character sets.
    
            - fixed 3144214 -- treat Big5 as Windows CP 950 the same way TEC does
    
            * kwq/mac-encodings.txt: Move Big5 names to kCFStringEncodingDOSChineseTrad
            instead of kCFStringEncodingBig5.
            * kwq/KWQCharsetData.c: Regenerated.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3611 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 4e918fe..213782c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,18 @@
+2003-02-07  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+        - fixed 3145899 -- tf1.fr page marked UTF-8 is being decoded as Latin-1 (due to <noscript> before <meta>)
+
+        * khtml/misc/decoder.cpp: (Decoder::decode): Add NOSCRIPT to the list of tags
+        that are allowed before META tags that specify character sets.
+
+        - fixed 3144214 -- treat Big5 as Windows CP 950 the same way TEC does
+
+        * kwq/mac-encodings.txt: Move Big5 names to kCFStringEncodingDOSChineseTrad
+        instead of kCFStringEncodingBig5.
+        * kwq/KWQCharsetData.c: Regenerated.
+
 2003-02-07  Richard Williamson   <rjw at apple.com>
 
         Changes to support per WebController preferences.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4e918fe..213782c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2003-02-07  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+        - fixed 3145899 -- tf1.fr page marked UTF-8 is being decoded as Latin-1 (due to <noscript> before <meta>)
+
+        * khtml/misc/decoder.cpp: (Decoder::decode): Add NOSCRIPT to the list of tags
+        that are allowed before META tags that specify character sets.
+
+        - fixed 3144214 -- treat Big5 as Windows CP 950 the same way TEC does
+
+        * kwq/mac-encodings.txt: Move Big5 names to kCFStringEncodingDOSChineseTrad
+        instead of kCFStringEncodingBig5.
+        * kwq/KWQCharsetData.c: Regenerated.
+
 2003-02-07  Richard Williamson   <rjw at apple.com>
 
         Changes to support per WebController preferences.
diff --git a/WebCore/khtml/misc/decoder.cpp b/WebCore/khtml/misc/decoder.cpp
index c801a07..2bf63ea 100644
--- a/WebCore/khtml/misc/decoder.cpp
+++ b/WebCore/khtml/misc/decoder.cpp
@@ -447,6 +447,8 @@ QString Decoder::decode(const char *data, int len)
 		    }
                     case ID_SCRIPT:
                     case (ID_SCRIPT+ID_CLOSE_TAG):
+                    case ID_NOSCRIPT:
+                    case (ID_NOSCRIPT+ID_CLOSE_TAG):
                     case ID_STYLE:
                     case (ID_STYLE+ID_CLOSE_TAG):
                     case ID_LINK:
diff --git a/WebCore/kwq/KWQCharsetData.c b/WebCore/kwq/KWQCharsetData.c
index 7edf50f..c1d6cbc 100644
--- a/WebCore/kwq/KWQCharsetData.c
+++ b/WebCore/kwq/KWQCharsetData.c
@@ -223,7 +223,11 @@ static const CharsetEntry table[] = {
     { "x-ms-cp932", kCFStringEncodingDOSJapanese },
     { "x-sjis", kCFStringEncodingDOSJapanese },
     { "cp949", kCFStringEncodingDOSKorean },
+    { "big5", kCFStringEncodingDOSChineseTrad },
+    { "cn-big5", kCFStringEncodingDOSChineseTrad },
     { "cp950", kCFStringEncodingDOSChineseTrad },
+    { "csbig5", kCFStringEncodingDOSChineseTrad },
+    { "x-x-big5", kCFStringEncodingDOSChineseTrad },
     { "windows-1250", kCFStringEncodingWindowsLatin2 },
     { "winlatin2", kCFStringEncodingWindowsLatin2 },
     { "x-cp1250", kCFStringEncodingWindowsLatin2 },
@@ -301,10 +305,6 @@ static const CharsetEntry table[] = {
     { "koi8", kCFStringEncodingKOI8_R },
     { "koi8-r", kCFStringEncodingKOI8_R },
     { "koi8r", kCFStringEncodingKOI8_R },
-    { "big5", kCFStringEncodingBig5 },
-    { "cn-big5", kCFStringEncodingBig5 },
-    { "csbig5", kCFStringEncodingBig5 },
-    { "x-x-big5", kCFStringEncodingBig5 },
     { "x-mac-roman-latin1", kCFStringEncodingMacRomanLatin1 },
     { "hz-gb-2312", kCFStringEncodingHZ_GB_2312 },
     { "big5-hkscs", kCFStringEncodingBig5_HKSCS_1999 },
diff --git a/WebCore/kwq/mac-encodings.txt b/WebCore/kwq/mac-encodings.txt
index a9808ce..e5e7892 100644
--- a/WebCore/kwq/mac-encodings.txt
+++ b/WebCore/kwq/mac-encodings.txt
@@ -98,7 +98,7 @@ DOSThai: cp874, dos-874, tis-620, windows-874
 DOSJapanese: cp932, cswindows31j, shift-jis, shift_jis, x-ms-cp932, x-sjis
 DOSChineseSimplif
 DOSKorean: cp949
-DOSChineseTrad: cp950
+DOSChineseTrad: big5, cn-big5, cp950, x-x-big5
 WindowsLatin2: windows-1250, winlatin2, x-cp1250
 WindowsCyrillic: wincyrillic, windows-1251, x-cp1251
 WindowsGreek: windows-1253, wingreek
@@ -139,7 +139,7 @@ EUC_KR: euc-kr
 
 ShiftJIS
 KOI8_R: koi, koi8, koi8-r, koi8r
-Big5: big5, cn-big5, x-x-big5
+Big5
 MacRomanLatin1: x-mac-roman-latin1
 HZ_GB_2312: hz-gb-2312
 Big5_HKSCS_1999: big5-hkscs

-- 
WebKit Debian packaging