Menu
▾
▴
[HtmlUnit] SVN: [15162] trunk/htmlunit/src
|
From: <rb...@us...> - 2018-03-07 11:14:20
|
Revision: 15162
http://sourceforge.net/p/htmlunit/code/15162
Author: rbri
Date: 2018-03-07 11:14:09 +0000 (Wed, 07 Mar 2018)
Log Message:
-----------
Use the correct content type when guessing from the '.js' file extension
Issue 1954
Modified Paths:
--------------
trunk/htmlunit/src/changes/changes.xml
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClientTest.java
Modified: trunk/htmlunit/src/changes/changes.xml
===================================================================
--- trunk/htmlunit/src/changes/changes.xml 2018-03-07 07:50:58 UTC (rev 15161)
+++ trunk/htmlunit/src/changes/changes.xml 2018-03-07 11:14:09 UTC (rev 15162)
@@ -8,6 +8,9 @@
<body>
<release version="2.30" date="xx, 2018" description="Bugfixes, URLSearchParams implemented, start adding support of user defined iterators, CHROME 64">
+ <action type="add" dev="rbri" issue="1954">
+ Use the correct content type when guessing from the '.js' file extension.
+ </action>
<action type="change" dev="rbri">
Major refactoring of the css handling (selector processing). Every style sheet now has
a selector index to speed up style processing.
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java 2018-03-07 07:50:58 UTC (rev 15161)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/WebClient.java 2018-03-07 11:14:09 UTC (rev 15162)
@@ -1243,7 +1243,7 @@
// Java's mime type map does not know these in JDK8.
if (fileName.endsWith(".js")) {
- return "text/javascript";
+ return "application/javascript";
}
if (fileName.toLowerCase(Locale.ROOT).endsWith(".css")) {
return "text/css";
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClientTest.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClientTest.java 2018-03-07 07:50:58 UTC (rev 15161)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/WebClientTest.java 2018-03-07 11:14:09 UTC (rev 15162)
@@ -1428,7 +1428,7 @@
assertEquals("empty.png", "image/png", c.guessContentType(getTestFile("empty.png")));
assertEquals("empty.jpg", "image/jpeg", c.guessContentType(getTestFile("empty.jpg")));
assertEquals("empty.gif", "image/gif", c.guessContentType(getTestFile("empty.gif")));
- assertEquals("empty.js", "text/javascript", c.guessContentType(getTestFile("empty.js")));
+ assertEquals("empty.js", "application/javascript", c.guessContentType(getTestFile("empty.js")));
assertEquals("empty.css", "text/css", c.guessContentType(getTestFile("empty.css")));
// test real files with bad file suffix
|
