You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2017/08/27 12:54:56 UTC
svn commit: r1806361 -
/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
Author: pmouawad
Date: Sun Aug 27 12:54:56 2017
New Revision: 1806361
URL: http://svn.apache.org/viewvc?rev=1806361&view=rev
Log:
Bug 61384 - Adding charset to multipart/form-data content type irritates IIS
Fix failing tests
Bugzilla Id: 61384
Modified:
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
Modified: jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java?rev=1806361&r1=1806360&r2=1806361&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java Sun Aug 27 12:54:56 2017
@@ -1279,7 +1279,7 @@ public class TestHTTPSamplersAgainstHttp
output.write("\"".getBytes(ISO_8859_1));
output.write(CRLF);
output.write("Content-Type: text/plain".getBytes(ISO_8859_1));
- if(contentEncoding != null) {
+ if(contentEncoding != null && !"US-ASCII".equalsIgnoreCase(contentEncoding)) {
output.write("; charset=".getBytes(ISO_8859_1));
output.write(contentEncoding.getBytes(ISO_8859_1));
}
@@ -1302,7 +1302,7 @@ public class TestHTTPSamplersAgainstHttp
output.write("\"".getBytes(ISO_8859_1));
output.write(CRLF);
output.write("Content-Type: text/plain".getBytes(ISO_8859_1));
- if(contentEncoding != null) {
+ if(contentEncoding != null && !"US-ASCII".equalsIgnoreCase(contentEncoding)) {
output.write("; charset=".getBytes(ISO_8859_1));
output.write(contentEncoding.getBytes(ISO_8859_1));
}