Author: pmouawad
Date: Sun Oct 28 21:10:03 2018
New Revision: 1845065
URL: http://svn.apache.org/viewvc?rev=1845065&view=rev
Log:
Bug 60424 - Hessian Burlap application : JMeter inserts 0x0D before 0x0A
automatically (http binary post data)
Bugzilla Id: 60424
Modified:
jmeter/trunk/bin/jmeter.properties
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/AbstractSamplerCreator.java
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/usermanual/properties_reference.xml
Modified: jmeter/trunk/bin/jmeter.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.properties?rev=1845065&r1=1845064&r2=1845065&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.properties (original)
+++ jmeter/trunk/bin/jmeter.properties Sun Oct 28 21:10:03 2018
@@ -627,7 +627,7 @@ upgrade_properties=/bin/upgrade.properti
# Binary content-type handling
# These content-types will be handled by saving the request in a file:
-#proxy.binary.types=application/x-amf,application/x-java-serialized-object
+#proxy.binary.types=application/x-amf,application/x-java-serialized-object,binary/octet-stream
# The files will be saved in this directory:
#proxy.binary.directory=user.dir
# The files will be created with this file filesuffix:
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/AbstractSamplerCreator.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/AbstractSamplerCreator.java?rev=1845065&r1=1845064&r2=1845065&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/AbstractSamplerCreator.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/AbstractSamplerCreator.java
Sun Oct 28 21:10:03 2018
@@ -63,7 +63,7 @@ public abstract class AbstractSamplerCre
static {
String binaries = JMeterUtils.getPropDefault("proxy.binary.types", //
$NON-NLS-1$
- "application/x-amf,application/x-java-serialized-object"); //
$NON-NLS-1$
+
"application/x-amf,application/x-java-serialized-object,binary/octet-stream");
// $NON-NLS-1$
if (binaries.length() > 0){
StringTokenizer s = new StringTokenizer(binaries,"|, ");//
$NON-NLS-1$
while (s.hasMoreTokens()){
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1845065&r1=1845064&r2=1845065&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sun Oct 28 21:10:03 2018
@@ -135,6 +135,7 @@ Summary
<ul>
<li><bug>62785</bug><pr>400</pr>Incomplete search path applied to the
filenames used in the upload functionality of the HTTP sampler. Implemented by
Artem Fedorov (artem.fedorov at blazemeter.com) and contributed by
BlazeMeter.</li>
<li><bug>62842</bug>HTTP(S) Test Script Recorder : Brotli compression is
not supported leading to "Content Encoding Error"</li>
+ <li><bug>60424</bug>Hessian Burlap application : JMeter inserts 0x0D
before 0x0A automatically (http binary post data)</li>
</ul>
<h3>Other Samplers</h3>
Modified: jmeter/trunk/xdocs/usermanual/properties_reference.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/properties_reference.xml?rev=1845065&r1=1845064&r2=1845065&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/properties_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/properties_reference.xml Sun Oct 28 21:10:03
2018
@@ -796,7 +796,7 @@ JMETER-SERVER</source>
<property name="proxy.binary.types">
Binary <code>content-type</code> handling.<br/>
These <code>content-types</code> will be handled by saving the request in
a file.<br/>
- Defaults to:
<code>application/x-amf,application/x-java-serialized-object</code>
+ Defaults to:
<code>application/x-amf,application/x-java-serialized-object,binary/octet-stream</code>
</property>
<property name="proxy.binary.directory">
The files will be saved in this directory.<br/>