[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 ab36bd90f7947eef40bc28039171ea62a213a253
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 24 04:52:35 2003 +0000

            Reviewed by Ken.
    
            - fixed 3390850 -- Shift_JIS in meta tag ignored because <img> tag in JavaScript comes first (vintagecomp.com)
    
            * khtml/misc/decoder.cpp: (Decoder::decode): Don't let tags inside a script make us think we're in the body.
            Later we can enhance this even more.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5042 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 856f97f..10c1d04 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-09-23  Darin Adler  <darin at apple.com>
+
+        Reviewed by Ken.
+
+        - fixed 3390850 -- Shift_JIS in meta tag ignored because <img> tag in JavaScript comes first (vintagecomp.com)
+
+        * khtml/misc/decoder.cpp: (Decoder::decode): Don't let tags inside a script make us think we're in the body.
+        Later we can enhance this even more.
+
 2003-09-22  Darin Adler  <darin at apple.com>
 
         Reviewed by Ken.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 856f97f..10c1d04 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-09-23  Darin Adler  <darin at apple.com>
+
+        Reviewed by Ken.
+
+        - fixed 3390850 -- Shift_JIS in meta tag ignored because <img> tag in JavaScript comes first (vintagecomp.com)
+
+        * khtml/misc/decoder.cpp: (Decoder::decode): Don't let tags inside a script make us think we're in the body.
+        Later we can enhance this even more.
+
 2003-09-22  Darin Adler  <darin at apple.com>
 
         Reviewed by Ken.
diff --git a/WebCore/khtml/misc/decoder.cpp b/WebCore/khtml/misc/decoder.cpp
index d0af566..7e72f3d 100644
--- a/WebCore/khtml/misc/decoder.cpp
+++ b/WebCore/khtml/misc/decoder.cpp
@@ -483,6 +483,7 @@ QString Decoder::decode(const char *data, int len)
             const char *ptr = buffer.data();
             const char *pEnd = buffer.length();
 #endif
+            bool inScript = false;
             while(ptr != pEnd)
             {
                 if(*ptr == '<') {
@@ -572,7 +573,11 @@ QString Decoder::decode(const char *data, int len)
 			}
 		    }
                     case ID_SCRIPT:
+                        inScript = true;
+                        break;
                     case (ID_SCRIPT+ID_CLOSE_TAG):
+                        inScript = false;
+                        break;
                     case ID_NOSCRIPT:
                     case (ID_NOSCRIPT+ID_CLOSE_TAG):
                     case ID_STYLE:
@@ -591,6 +596,8 @@ QString Decoder::decode(const char *data, int len)
                     case (0 + ID_CLOSE_TAG ):
                         break;
                     default:
+                        if (inScript)
+                            break;
                         body = true;
 #ifdef DECODE_DEBUG
 			kdDebug( 6005 ) << "Decoder: no charset found. Id=" << id << endl;

-- 
WebKit Debian packaging