svn commit: r1410860 - in /jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java xdocs/changes.xml

[pmouawad]

Author: pmouawad
Date: Sun Nov 18 10:06:44 2012
New Revision: 1410860

URL: http://svn.apache.org/viewvc?rev=1410860&view=rev
Log:
Bug 54161 - Proxy : be able to create binary sampler for x-www-form-urlencoded 
POST request
Bugzilla Id: 54161

Modified:
    
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
    jmeter/trunk/xdocs/changes.xml

Modified: 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java?rev=1410860&r1=1410859&r2=1410860&view=diff
==============================================================================
--- 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
 (original)
+++ 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
 Sun Nov 18 10:06:44 2012
@@ -172,7 +172,9 @@ public class DefaultSamplerCreator exten
             // used when postData is pure xml (eg. an xml-rpc call) or for PUT
             } else if (postData.trim().startsWith("<?") || 
HTTPConstants.PUT.equals(sampler.getMethod())) {
                 sampler.addNonEncodedArgument("", postData, "");
-            } else if (contentType == null || 
contentType.startsWith(HTTPConstants.APPLICATION_X_WWW_FORM_URLENCODED) ){
+            } else if (contentType == null || 
+                    
(contentType.startsWith(HTTPConstants.APPLICATION_X_WWW_FORM_URLENCODED) && 
+                            !isBinaryContent(contentType))) {
                 // It is the most common post request, with parameter name and 
values
                 // We also assume this if no content type is present, to be 
most backwards compatible,
                 // but maybe we should only parse arguments if the content 
type is as expected

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1410860&r1=1410859&r2=1410860&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sun Nov 18 10:06:44 2012
@@ -187,6 +187,7 @@ and right angle bracket (&gt;) in search
 <li><bugzilla>53875</bugzilla> - Include suggested defaults for URL filters on 
HTTP Proxy</li>
 <li><bugzilla>54031</bugzilla> - Add tooltip to running/total threads 
indicator </li>
 <li>Webservice (SOAP) Request has been deprecated</li>
+<li><bugzilla>54161</bugzilla> - Proxy : be able to create binary sampler for 
x-www-form-urlencoded POST request</li>
 </ul>
 
 <h2>Non-functional changes</h2>