Author: pmouawad
Date: Tue Feb 28 10:03:45 2012
New Revision: 1294541

URL: http://svn.apache.org/viewvc?rev=1294541&view=rev
Log:
Bug 52781 - Content-Disposition header garbled even if browser compatible 
headers is checked (HC4) 

Modified:
    
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
    jmeter/trunk/xdocs/changes.xml

Modified: 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java?rev=1294541&r1=1294540&r2=1294541&view=diff
==============================================================================
--- 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
 (original)
+++ 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
 Tue Feb 28 10:03:45 2012
@@ -792,7 +792,8 @@ public class HTTPHC4Impl extends HTTPHCA
 
             // Write the request to our own stream
             MultipartEntity multiPart = new MultipartEntity(
-                    getDoBrowserCompatibleMultipart() ? 
HttpMultipartMode.BROWSER_COMPATIBLE : HttpMultipartMode.STRICT);
+                    getDoBrowserCompatibleMultipart() ? 
HttpMultipartMode.BROWSER_COMPATIBLE : HttpMultipartMode.STRICT,
+                            null, Charset.forName(contentEncoding));
             // Create the parts
             // Add any parameters
             PropertyIterator args = getArguments().iterator();

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1294541&r1=1294540&r2=1294541&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Tue Feb 28 10:03:45 2012
@@ -71,6 +71,7 @@ When doing replacement of User Defined V
 <h3>HTTP Samplers and Proxy</h3>
 <ul>
 <li>Bug 52613 - Using Raw Post Body option, text gets encoded</li>
+<li>Bug 52781 - Content-Disposition header garbled even if browser compatible 
headers is checked (HC4) </li>
 </ul>
 
 <h3>Other Samplers</h3>


Reply via email to