Menu
▾
▴
[HtmlUnit] SVN: [9195] trunk/htmlunit/src
|
From: <rb...@us...> - 2014-03-20 21:05:17
|
Revision: 9195
http://sourceforge.net/p/htmlunit/code/9195
Author: rbri
Date: 2014-03-20 21:05:13 +0000 (Thu, 20 Mar 2014)
Log Message:
-----------
File upload content type shouldn't contain charset
Modified Paths:
--------------
trunk/htmlunit/src/changes/changes.xml
trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpWebConnection.java
trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInput2Test.java
Modified: trunk/htmlunit/src/changes/changes.xml
===================================================================
--- trunk/htmlunit/src/changes/changes.xml 2014-03-20 20:20:52 UTC (rev 9194)
+++ trunk/htmlunit/src/changes/changes.xml 2014-03-20 21:05:13 UTC (rev 9195)
@@ -8,7 +8,10 @@
<body>
<release version="2.15" date="???" description="Bugfixes">
- <action type="add" dev="rbri" issue="1584" >
+ <action type="fix" dev="rbri" issue="1585" due-to="Jakub Kotasek">
+ File upload content type shouldn't contain charset.
+ </action>
+ <action type="fix" dev="rbri" issue="1584" >
JavaScript: setting outerHTML now works also for detached elements.
</action>
<action type="add" dev="rbri">
Modified: trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpWebConnection.java
===================================================================
--- trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpWebConnection.java 2014-03-20 20:20:52 UTC (rev 9194)
+++ trunk/htmlunit/src/main/java/com/gargoylesoftware/htmlunit/HttpWebConnection.java 2014-03-20 21:05:13 UTC (rev 9195)
@@ -425,7 +425,7 @@
mimeType = "application/octet-stream";
}
- final ContentType contentType = ContentType.create(mimeType, pairWithFile.getCharset());
+ final ContentType contentType = ContentType.create(mimeType);
final File file = pairWithFile.getFile();
if (pairWithFile.getData() != null) {
Modified: trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInput2Test.java
===================================================================
--- trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInput2Test.java 2014-03-20 20:20:52 UTC (rev 9194)
+++ trunk/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/html/HtmlFileInput2Test.java 2014-03-20 21:05:13 UTC (rev 9195)
@@ -74,7 +74,10 @@
}
driver.findElement(By.name("myInput")).sendKeys(path);
driver.findElement(By.id("mySubmit")).click();
- assertTrue(driver.getPageSource().contains("CONTENT_TYPE:application/octet-stream"));
+
+ final String pageSource = driver.getPageSource();
+ assertTrue(pageSource.contains("CONTENT_TYPE:application/octet-stream"));
+ assertFalse(pageSource.contains("charset"));
}
/**
|
