Author: sebb Date: Sat Mar 3 04:55:26 2007 New Revision: 514149 URL: http://svn.apache.org/viewvc?view=rev&rev=514149 Log: Bug 41707 - HTTP Proxy XML-RPC support
Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java?view=diff&rev=514149&r1=514148&r2=514149 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java Sat Mar 3 04:55:26 2007 @@ -246,8 +246,10 @@ sampler.setFileField(urlConfig.getFileFieldName()); sampler.setFilename(urlConfig.getFilename()); sampler.setMimetype(urlConfig.getMimeType()); + } else if (postData != null && postData.trim().startsWith("<?")) { + sampler.addNonEncodedArgument("", postData, ""); //used when postData is pure xml (ex. an xml-rpc call) } else { - sampler.parseArguments(postData); + sampler.parseArguments(postData); //standard name=value postData } if (log.isDebugEnabled()) log.debug("sampler path = " + sampler.getPath()); Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?view=diff&rev=514149&r1=514148&r2=514149 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java Sat Mar 3 04:55:26 2007 @@ -395,7 +395,13 @@ } this.getArguments().addArgument(arg); } - + + public void addNonEncodedArgument(String name, String value, String metadata) { + HTTPArgument arg = new HTTPArgument(name, value, metadata, false); + arg.setAlwaysEncoded(false); + this.getArguments().addArgument(arg); + } + public void addArgument(String name, String value) { this.getArguments().addArgument(new HTTPArgument(name, value)); } Modified: jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml?view=diff&rev=514149&r1=514148&r2=514149 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original) +++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Sat Mar 3 04:55:26 2007 @@ -71,6 +71,9 @@ <li>Bug 41253 - extend XPathExtractor to work with non-NodeList XPath expressions</li> <li>Bug 39717 - use icons in the results tree instead of colors</li> <li>Added __V variable function to resolve nested variable names</li> +<li>Bug 41707 - HTTP Proxy XML-RPC support</li> +<li>Bug 40381 - LDAP: more descriptive strings</li> +<li>Bug 40369 (partial) Equals Response Assertion</li> </ul> <h4>Non-functional improvements:</h4> @@ -78,6 +81,7 @@ <li>Change to htmlparser 2.0</li> <li>Updated to xstream 1.2.1/xpp3_min-1.1.3.4.O</li> <li>Functor calls can now be unit tested</li> +<li>Replace com.sun.net classes with javax.net</li> </ul> <h4>Bug fixes:</h4> @@ -100,13 +104,10 @@ <li>Fix NPE when saving thread counts in remote testing</li> <li>Bug 34261 - NPE in HtmlParser (allow for missing attributes)</li> <li>Bug 40100 - check FileServer type before calling close</li> -<li>Replace com.sun.net classes with javax.net</li> <li>Bug 39887 - jmeter.util.SSLManager: Couldn't load keystore error message</li> <li>Bug 41543 - exception when webserver returns "500 Internal Server Error" and content-length is 0</li> <li>Bug 41416 - don't use chunked input for text-box input in SOAP-RPC sampler</li> <li>Bug 39827 - SOAP Sampler content length for files</li> -<li>Bug 40381 - LDAP: more descriptive strings</li> -<li>Bug 40369 (partial) Equals Response Assertion</li> <li>Fix Class cast exception in Clear.java</li> <li>Bug 40383 - don't set content-type if already set</li> <li>Mailer Visualiser test button now works if test plan has not yet been saved</li> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]