[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 386bb85dbb71adfb57b0b614db9807380dad3f76
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 27 00:46:19 2003 +0000

    	Fix for 3335175, www.calstone.com renders as blank.  The fix is to deliberately
    	introduce an error into our HTML parsing code that causes us to honor self-closing
    	XML-style <script/> tags.  This matches Mozilla and Opera behavior (both of them
    	have this bug), but it does not match WinIE.
    
            Reviewed by mjs
    
            * khtml/html/htmltokenizer.cpp:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4894 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 1a4ab99..a22a531 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,16 @@
 2003-08-26  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3335175, www.calstone.com renders as blank.  The fix is to deliberately
+	introduce an error into our HTML parsing code that causes us to honor self-closing
+	XML-style <script/> tags.  This matches Mozilla and Opera behavior (both of them
+	have this bug), but it does not match WinIE.
+	
+        Reviewed by mjs
+
+        * khtml/html/htmltokenizer.cpp:
+
+2003-08-26  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3286229, popup menu misplaced.  <form> needs to be allowed as a child of
 	<h1>-<h6> tags.  All other browsers allow this.
 	
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 1a4ab99..a22a531 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,16 @@
 2003-08-26  David Hyatt  <hyatt at apple.com>
 
+	Fix for 3335175, www.calstone.com renders as blank.  The fix is to deliberately
+	introduce an error into our HTML parsing code that causes us to honor self-closing
+	XML-style <script/> tags.  This matches Mozilla and Opera behavior (both of them
+	have this bug), but it does not match WinIE.
+	
+        Reviewed by mjs
+
+        * khtml/html/htmltokenizer.cpp:
+
+2003-08-26  David Hyatt  <hyatt at apple.com>
+
 	Fix for 3286229, popup menu misplaced.  <form> needs to be allowed as a child of
 	<h1>-<h6> tags.  All other browsers allow this.
 	
diff --git a/WebCore/khtml/html/htmltokenizer.cpp b/WebCore/khtml/html/htmltokenizer.cpp
index 82928d8..e0f317d 100644
--- a/WebCore/khtml/html/htmltokenizer.cpp
+++ b/WebCore/khtml/html/htmltokenizer.cpp
@@ -935,12 +935,13 @@ void HTMLTokenizer::parseTag(DOMStringIt &src)
                 else
                     // Start Tag
                     beginTag = true;
-                    
+
+                uint tagID = khtml::getTagID(ptr, len);
+                
                 // Accept empty xml tags like <br/>
                 if(len > 1 && ptr[len-1] == '/' )
                     ptr[--len] = '\0';
-
-                uint tagID = khtml::getTagID(ptr, len);
+                
                 if (!tagID) {
 #ifdef TOKEN_DEBUG
                     QCString tmp(ptr, len+1);
@@ -1012,6 +1013,15 @@ void HTMLTokenizer::parseTag(DOMStringIt &src)
                         else {
                             attrName = QString::fromLatin1(QCString(cBuffer, cBufferPos+1).data());
                             attrNamePresent = !attrName.isEmpty();
+
+                            // This is a deliberate quirk to match Mozilla and Opera.  We have to do this
+                            // since sites that use the "standards-compliant" path sometimes send
+                            // <script src="foo.js"/>.  Both Moz and Opera will honor this, despite it
+                            // being bogus HTML.  They do not honor the "/" for other tags.  This behavior
+                            // also deviates from WinIE, but in this case we'll just copy Moz and Opera.
+                            if (currToken.id == ID_SCRIPT && curchar == '>' &&
+                                attrName == "/")
+                                currToken.flat = true;
                         }
                         
                         dest = buffer;

-- 
WebKit Debian packaging