[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 3af7eee09829563a95cd1762403322353eff67e2
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 9 22:11:56 2003 +0000

    	Fix for 3491235, really make <script src="..."/> work in HTML.  My original attempt to fix this only made
    	the tag flat, but did not ensure that the script got processed.
    
            Reviewed by john
    
            * khtml/html/htmltokenizer.cpp:
            (HTMLTokenizer::parseTag):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5728 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 14f88c9..a34c936 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-12-09  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3491235, really make <script src="..."/> work in HTML.  My original attempt to fix this only made
+	the tag flat, but did not ensure that the script got processed.
+	
+        Reviewed by john
+
+        * khtml/html/htmltokenizer.cpp:
+        (HTMLTokenizer::parseTag):
+
 2003-12-08  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3503652, news.com misrenders badly (footer is out of position).  My fix to 3495748 caused this
diff --git a/WebCore/khtml/html/htmltokenizer.cpp b/WebCore/khtml/html/htmltokenizer.cpp
index 7c4c058..7ce3c98 100644
--- a/WebCore/khtml/html/htmltokenizer.cpp
+++ b/WebCore/khtml/html/htmltokenizer.cpp
@@ -1240,9 +1240,9 @@ void HTMLTokenizer::parseTag(DOMStringIt &src)
 #endif
             bool beginTag = !currToken.flat && (tagID < ID_CLOSE_TAG);
 
-            if(tagID >= ID_CLOSE_TAG)
+            if (tagID >= ID_CLOSE_TAG)
                 tagID -= ID_CLOSE_TAG;
-            else if ( beginTag && tagID == ID_SCRIPT ) {
+            else if (tagID == ID_SCRIPT) {
                 AttributeImpl* a = 0;
                 scriptSrc = QString::null;
                 scriptSrcCharset = QString::null;
@@ -1293,6 +1293,8 @@ void HTMLTokenizer::parseTag(DOMStringIt &src)
                     script = true;
                     parseSpecial(src);
                 }
+                else if (tagID < ID_CLOSE_TAG) // Handle <script src="foo"/>
+                    scriptHandler();
                 break;
             case ID_STYLE:
                 if (beginTag) {

-- 
WebKit Debian packaging