Author: sebb Date: Fri Jan 30 23:00:17 2009 New Revision: 739445 URL: http://svn.apache.org/viewvc?rev=739445&view=rev Log: Bug 46435 - More verbose error msg for error 501 (Proxy Server)
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java jakarta/jmeter/trunk/xdocs/changes.xml Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java?rev=739445&r1=739444&r2=739445&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java (original) +++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpReplyHdr.java Fri Jan 30 23:00:17 2009 @@ -245,6 +245,16 @@ } /** + * Server does not do the requested feature. + * + * @param reason detailed information for causing the failure + * @return The header in a string; + */ + public static String formNotImplemented(String reason) { + return formError("501 Method not implemented", "Service not implemented. " + reason); + } + + /** * Server is overloaded, client should try again latter. * * @return The header in a string; Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java?rev=739445&r1=739444&r2=739445&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java (original) +++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java Fri Jan 30 23:00:17 2009 @@ -221,7 +221,9 @@ result = generateErrorResult(result, uhe); // Generate result (if nec.) and populate it } catch (IllegalArgumentException e) { log.error("Not implemented (probably used https)", e); - writeErrorToClient(HttpReplyHdr.formNotImplemented()); + writeErrorToClient(HttpReplyHdr.formNotImplemented("Probably used https instead of http. " + + "To record https requests, see " + + "<a href=\"http://jakarta.apache.org/jmeter/usermanual/component_reference.html#HTTP_Proxy_Server\">HTTP Proxy Server documentation</a>")); result = generateErrorResult(result, e); // Generate result (if nec.) and populate it } catch (Exception e) { log.error("Exception when processing sample", e); Modified: jakarta/jmeter/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=739445&r1=739444&r2=739445&view=diff ============================================================================== --- jakarta/jmeter/trunk/xdocs/changes.xml (original) +++ jakarta/jmeter/trunk/xdocs/changes.xml Fri Jan 30 23:00:17 2009 @@ -184,6 +184,7 @@ <li>Bug 46436 - Improve error reporting in Proxy Gui</li> <li>Fix potential thread safety issue in JMeterThread class</li> <li>Mailer Visualiser - fix parsing of multiple e-mail address when using Test button</li> +<li>Bug 46435 - More verbose error msg for error 501 (Proxy Server)</li> </ul> <h3>Improvements</h3> --------------------------------------------------------------------- To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org