mstover1 2004/04/02 15:41:52 Modified: src/protocol/http/org/apache/jmeter/protocol/http/config/gui Tag: rel-2_0 UrlConfigGui.java src/protocol/http/org/apache/jmeter/protocol/http/proxy Tag: rel-2_0 HttpRequestHdr.java Proxy.java Log: Fixing proxy server which was completely broken. How'd that happen anyway? Revision Changes Path No revision No revision 1.16.2.1 +3 -2 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java Index: UrlConfigGui.java =================================================================== RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java,v retrieving revision 1.16 retrieving revision 1.16.2.1 diff -u -r1.16 -r1.16.2.1 --- UrlConfigGui.java 21 Mar 2004 04:21:19 -0000 1.16 +++ UrlConfigGui.java 2 Apr 2004 23:41:51 -0000 1.16.2.1 @@ -110,6 +110,7 @@ element.setProperty(HTTPSampler.METHOD, (post.isSelected() ? "POST" : "GET")); element.setProperty(HTTPSampler.PATH, path.getText()); + element.setProperty(HTTPSampler.ENCODED_PATH,path.getText()); element.setProperty(new BooleanProperty(HTTPSampler.FOLLOW_REDIRECTS, followRedirects.isSelected())); element.setProperty(new BooleanProperty(HTTPSampler.AUTO_REDIRECTS, No revision No revision 1.23.2.1 +5 -4 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java Index: HttpRequestHdr.java =================================================================== RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java,v retrieving revision 1.23 retrieving revision 1.23.2.1 diff -u -r1.23 -r1.23.2.1 --- HttpRequestHdr.java 12 Feb 2004 01:19:53 -0000 1.23 +++ HttpRequestHdr.java 2 Apr 2004 23:41:51 -0000 1.23.2.1 @@ -187,8 +187,9 @@ // Damn! A whole new GUI just to instantiate a test element? // Isn't there a beter way? HttpTestSampleGui tempGui = new HttpTestSampleGui(); - tempGui.configure(createSampler()); - HTTPSampler result = (HTTPSampler) tempGui.createTestElement(); + HTTPSampler result = createSampler(); + tempGui.configure(result); + tempGui.modifyTestElement(result); result.setFollowRedirects(false); result.setUseKeepAlive(true); return result; 1.17.2.1 +2 -3 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java Index: Proxy.java =================================================================== RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java,v retrieving revision 1.17 retrieving revision 1.17.2.1 diff -u -r1.17 -r1.17.2.1 --- Proxy.java 12 Feb 2004 00:29:50 -0000 1.17 +++ Proxy.java 2 Apr 2004 23:41:52 -0000 1.17.2.1 @@ -114,7 +114,6 @@ */ headers = request.getHeaderManager(); sampler.setHeaderManager(headers); - result = sampler.sample(); writeToClient( result,
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]