[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 a1e24cc1499218e933f7b343212907d4d573fe17
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jun 5 15:41:55 2003 +0000

            Reviewed by John.
    
    	- fixed 3278079 -- REGRESSION: UTF-8 page claiming to be UTF-16 in XML header gives garbage characters
    
            * khtml/misc/decoder.cpp: (Decoder::setEncoding): Add EncodingFromXMLHeader as one of the
            types where we know the encoding is an 8-bit one. The reason this is a regression is that we
            used to ignore the encoding in the XML header altogether.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4484 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index c8c27ed..0e3cc3b 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-06-05  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+	- fixed 3278079 -- REGRESSION: UTF-8 page claiming to be UTF-16 in XML header gives garbage characters
+
+        * khtml/misc/decoder.cpp: (Decoder::setEncoding): Add EncodingFromXMLHeader as one of the
+        types where we know the encoding is an 8-bit one. The reason this is a regression is that we
+        used to ignore the encoding in the XML header altogether.
+
 2003-06-04  John Sullivan  <sullivan at apple.com>
 
 	- fixed 3279957 -- REGRESSION: assertion failure at launch in 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index c8c27ed..0e3cc3b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-06-05  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+	- fixed 3278079 -- REGRESSION: UTF-8 page claiming to be UTF-16 in XML header gives garbage characters
+
+        * khtml/misc/decoder.cpp: (Decoder::setEncoding): Add EncodingFromXMLHeader as one of the
+        types where we know the encoding is an 8-bit one. The reason this is a regression is that we
+        used to ignore the encoding in the XML header altogether.
+
 2003-06-04  John Sullivan  <sullivan at apple.com>
 
 	- fixed 3279957 -- REGRESSION: assertion failure at launch in 
diff --git a/WebCore/khtml/misc/decoder.cpp b/WebCore/khtml/misc/decoder.cpp
index c62af22..d0af566 100644
--- a/WebCore/khtml/misc/decoder.cpp
+++ b/WebCore/khtml/misc/decoder.cpp
@@ -298,7 +298,7 @@ void Decoder::setEncoding(const char *_encoding, EncodingType type)
         return;
 
 #if APPLE_CHANGES
-    QTextCodec *codec = (type == EncodingFromMetaTag)
+    QTextCodec *codec = (type == EncodingFromMetaTag || type == EncodingFromXMLHeader)
         ? QTextCodec::codecForNameEightBitOnly(enc)
         : QTextCodec::codecForName(enc);
     if (codec) {

-- 
WebKit Debian packaging