You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by ms...@apache.org on 2002/08/07 15:47:03 UTC
cvs commit: jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/proxy ProxyControl.java
mstover1 2002/08/07 06:47:03
Modified: src_1/org/apache/jmeter/protocol/http/proxy
ProxyControl.java
Log:
Filtering URLs for proxy server now includes port and query string
Revision Changes Path
1.7 +21 -3 jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
Index: ProxyControl.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/protocol/http/proxy/ProxyControl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ProxyControl.java 6 Aug 2002 18:55:23 -0000 1.6
+++ ProxyControl.java 7 Aug 2002 13:47:03 -0000 1.7
@@ -396,7 +396,16 @@
try
{
Pattern pattern = compiler.compile(item);
- ok = matcher.matches(sampler.getDomain() + sampler.getPath(), pattern);
+ StringBuffer url = new StringBuffer(sampler.getDomain());
+ url.append(":");
+ url.append(sampler.getPort());
+ url.append(sampler.getPath());
+ if(sampler.getQueryString().length() > 0)
+ {
+ url.append("?");
+ url.append(sampler.getQueryString());
+ }
+ ok = matcher.matches(url.toString(), pattern);
}
catch (MalformedPatternException e)
{
@@ -420,7 +429,16 @@
try
{
Pattern pattern = compiler.compile(item);
- ok = ok && !matcher.matches(sampler.getDomain() + sampler.getPath(), pattern);
+ StringBuffer url = new StringBuffer(sampler.getDomain());
+ url.append(":");
+ url.append(sampler.getPort());
+ url.append(sampler.getPath());
+ if(sampler.getQueryString().length() > 0)
+ {
+ url.append("?");
+ url.append(sampler.getQueryString());
+ }
+ ok = ok && !matcher.matches(url.toString(), pattern);
}
catch (MalformedPatternException e)
{
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>