[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 114862bba264a42bc32283e4b9a60d2db2ea8910
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 2 17:03:32 2004 +0000

            Reviewed by Dave.
    
            - fixed half of <rdar://problem/3709244> utf-8 meta tag not parsed when page title contains angle brackets or if </meta> tag used
    
            * khtml/misc/decoder.cpp: (Decoder::decode): Allow </meta> tags without deciding we
            are done with the header.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6957 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5e1a805..f6ad13c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2004-07-02  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+        - fixed half of <rdar://problem/3709244> utf-8 meta tag not parsed when page title contains angle brackets or if </meta> tag used
+
+        * khtml/misc/decoder.cpp: (Decoder::decode): Allow </meta> tags without deciding we
+        are done with the header.
+
 2004-06-30  Trey Matteson  <trey at apple.com>
 
 	Dragging within a web view should be allowed to start when the window isn't key.
diff --git a/WebCore/khtml/misc/decoder.cpp b/WebCore/khtml/misc/decoder.cpp
index d0af566..ca24a6f 100644
--- a/WebCore/khtml/misc/decoder.cpp
+++ b/WebCore/khtml/misc/decoder.cpp
@@ -571,6 +571,7 @@ QString Decoder::decode(const char *data, int len)
 			    pos = endpos + 1;
 			}
 		    }
+                    case (ID_META+ID_CLOSE_TAG):
                     case ID_SCRIPT:
                     case (ID_SCRIPT+ID_CLOSE_TAG):
                     case ID_NOSCRIPT:

-- 
WebKit Debian packaging