From: sullivan <sullivan@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue, 28 Sep 2004 18:55:48 +0000 (+0000)
Subject:         Reviewed by Chris.
X-Git-Url: https://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=17a12201238575afc2557fe10deb2768c0bf7d1a

    Reviewed by Chris.

        - fixed <rdar://problem/3818558> REGRESSION: "Installed Plug-ins" is blank
        because of <script type="application/x-javascript">

        * khtml/html/htmltokenizer.cpp:
        (khtml::HTMLTokenizer::parseTag):
        add "application/x-javascript" to the list of legal scripting types. Mozilla
        accepts this, but WinIE doesn't.

        * layout-tests/fast/tokenizer/004.html:
        updated layout test to test some application/xxxx types


git-svn-id: https://svn.webkit.org/repository/webkit/trunk@7710 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---

diff --git a/LayoutTests/fast/tokenizer/004.html b/LayoutTests/fast/tokenizer/004.html
index 5fd32caed259..00f94772a13d 100644
--- a/LayoutTests/fast/tokenizer/004.html
+++ b/LayoutTests/fast/tokenizer/004.html
@@ -19,6 +19,7 @@
 	<li>text/javascript1.3 <script type="text/javascript1.3">document.write("***");</script></li>
 	<li>text/javascript1.4 <script type="text/javascript1.4">document.write("***");</script></li>
 	<li>text/javascript1.5 <script type="text/javascript1.5">document.write("***");</script></li>
+	<li>application/x-javascript <script type="application/x-javascript">document.write("***");</script></li>
 </ol>
 <h4>These scripts should not execute</h4>
 <ol>
@@ -29,6 +30,15 @@
 	<li>text/xml <script type="text/xml">document.write("***");</script></li>
 	<li>text/javascript1 <script type="text/javascript1">document.write("***");</script></li>
 	<li>text/javascript1.6 <script type="text/javascript1.6">document.write("***");</script></li>
+	<li>application/jscript <script type="application/jscript">document.write("***");</script></li>
+	<li>application/x-jscript <script type="application/x-jscript">document.write("***");</script></li>
+	<li>application/livescript <script type="application/livescript">document.write("***");</script></li>
+	<li>application/x-livescript <script type="application/x-livescript">document.write("***");</script></li>
+	<li>application/ecmascript <script type="application/ecmascript">document.write("***");</script></li>
+	<li>application/x-ecmascript <script type="application/x-ecmascript">document.write("***");</script></li>
+	<li>application/javascript <script type="application/javascript">document.write("***");</script></li>
+	<li>application/javascript1.2 <script type="application/javascript1.2">document.write("***");</script></li>
+	<li>application/x-javascript1.2 <script type="application/x-javascript1.2">document.write("***");</script></li>
 	<li>javascript <script type="javascript">document.write("***");</script></li>
 	<li>jscript <script type="jscript">document.write("***");</script></li>
 	<li>ecmascript <script type="ecmascript">document.write("***");</script></li>
@@ -166,4 +176,4 @@
 	<li>empty string language, "bogus" type <script type="bogus" language="">document.write("***");</script></li>
 </ol>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 80146bcc4252..0b5c1b5401d5 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,18 @@
+2004-09-28  John Sullivan  <sullivan@apple.com>
+
+        Reviewed by Chris.
+
+        - fixed <rdar://problem/3818558> REGRESSION: "Installed Plug-ins" is blank 
+        because of <script type="application/x-javascript">
+
+        * khtml/html/htmltokenizer.cpp:
+        (khtml::HTMLTokenizer::parseTag):
+        add "application/x-javascript" to the list of legal scripting types. Mozilla
+        accepts this, but WinIE doesn't.
+        
+        * layout-tests/fast/tokenizer/004.html:
+        updated layout test to test some application/xxxx types
+
 2004-09-27  David Hyatt  <hyatt@apple.com>
 
 	Reworked lists to work well with RTL text.  Specifically the following bugs have been fixed:
diff --git a/WebCore/khtml/html/htmltokenizer.cpp b/WebCore/khtml/html/htmltokenizer.cpp
index 27c6a2f1033c..2bcbb6e30135 100644
--- a/WebCore/khtml/html/htmltokenizer.cpp
+++ b/WebCore/khtml/html/htmltokenizer.cpp
@@ -1315,6 +1315,10 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
 
                 if( foundTypeAttribute ) {
                     /* 
+                        Mozilla 1.5 accepts application/x-javascript, and some web references claim it is the only
+                        correct variation, but WinIE 6 doesn't accept it.
+                        Neither Mozilla 1.5 nor WinIE 6 accept application/javascript, application/ecmascript, or
+                        application/x-ecmascript.
                         Mozilla 1.5 doesn't accept the text/javascript1.x formats, but WinIE 6 does.
                         Mozilla 1.5 doesn't accept text/jscript, text/ecmascript, and text/livescript, but WinIE 6 does.
                         Mozilla 1.5 allows leading and trailing whitespace, but WinIE 6 doesn't.
@@ -1322,7 +1326,8 @@ void HTMLTokenizer::parseTag(TokenizerString &src)
                         We want to accept all the values that either of these browsers accept, but not other values.
                      */
                     QString type = a->value().string().stripWhiteSpace().lower();
-                    if( type.compare("text/javascript") != 0 &&
+                    if( type.compare("application/x-javascript") != 0 &&
+                        type.compare("text/javascript") != 0 &&
                         type.compare("text/javascript1.0") != 0 &&
                         type.compare("text/javascript1.1") != 0 &&
                         type.compare("text/javascript1.2") != 0 &&