[webkit-changes] cvs commit: WebCore/khtml/misc decoder.cpp

[Eric]

eseidel     05/11/26 18:26:44

  Modified:    .        ChangeLog
               khtml/misc decoder.cpp
  Log:
  Bug #: 5548
  Submitted by: ap
  Reviewed by: darin
          Fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=5548
          Allow <meta> to override encoding.
  
          * khtml/misc/decoder.cpp:
          (Decoder::decode):
  
  Revision  Changes    Path
  1.406     +10 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.405
  retrieving revision 1.406
  diff -u -r1.405 -r1.406
  --- ChangeLog	27 Nov 2005 02:06:53 -0000	1.405
  +++ ChangeLog	27 Nov 2005 02:26:38 -0000	1.406
  @@ -1,3 +1,13 @@
  +2005-11-26  Alexey Proskuryakov  <ap at nypop.com>
  +
  +        Reviewed by darin.
  +
  +        Fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=5548
  +        Allow <meta> to override encoding.
  +
  +        * khtml/misc/decoder.cpp:
  +        (Decoder::decode):
  +
   2005-11-26  Mitz Pettel  <opendarwin.org at mitzpettel.com>
   
           Reviewed by ggaren.  Committed by eseidel.
  
  
  
  1.47      +5 -7      WebCore/khtml/misc/decoder.cpp
  
  Index: decoder.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/misc/decoder.cpp,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- decoder.cpp	21 Nov 2005 01:20:19 -0000	1.46
  +++ decoder.cpp	27 Nov 2005 02:26:44 -0000	1.47
  @@ -484,13 +484,11 @@
                           QCString str(ptr, end - ptr);
                           int len;
                           int pos = findXMLEncoding(str, len);
  -                        if (pos != -1) {
  +                        if (pos != -1)
                               setEncoding(str.mid(pos, len), EncodingFromXMLHeader);
  -                            if (m_type == EncodingFromXMLHeader)
  -                                goto found;
  -                        }
  -                        setEncoding("UTF-8", EncodingFromXMLHeader);
  -                        goto found;
  +                        if (m_type != EncodingFromXMLHeader)
  +                            setEncoding("UTF-8", EncodingFromXMLHeader);
  +                        // continue looking for a charset - it may be specified in an HTTP-Equiv meta
                       } else if (ptr[0] == 0 && ptr[1] == '?' && ptr[2] == 0 && ptr[3] == 'x' && ptr[4] == 0 && ptr[5] == 'm' && ptr[6] == 0 && ptr[7] == 'l') {
                           // UTF-16 without BOM
                           setEncoding(((ptr - buffer.latin1()) % 2) ? "UTF-16LE" : "UTF-16BE", AutoDetectedEncoding);
  @@ -562,7 +560,7 @@
                                  (tag != headTag) && isalpha(tmp[0])) {
                           body = true;
   #ifdef DECODE_DEBUG
  -                        kdDebug( 6005 ) << "Decoder: no charset found (bailing because of \"" << tag.ascii() << "\")." << endl;
  +                        kdDebug( 6005 ) << "Decoder: no charset found (bailing because of \"" << tag.qstring().ascii() << "\")." << endl;
   #endif
                           goto found;
                       }