Author: sebb
Date: Sat Nov 20 21:59:16 2010
New Revision: 1037342
URL: http://svn.apache.org/viewvc?rev=1037342&view=rev
Log:
Bug 50286 - don't capture < in non-path-extension RE
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/modifier/TestURLRewritingModifier.java
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java?rev=1037342&r1=1037341&r2=1037342&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.java
Sat Nov 20 21:59:16 2010
@@ -164,7 +164,7 @@ public class URLRewritingModifier extend
parameterRegexp = JMeterUtils.getPatternCache().getPattern(
// ;sessionid=value
- "[;\\?&]" + quotedArg + "=([^\"'>&\\s;\\\\]*)" + //
$NON-NLS-1$
+ "[;\\?&]" + quotedArg + "=([^\"'<>&\\s;\\\\]*)" + //
$NON-NLS-1$
// name="sessionid" value="value"
"|\\s[Nn][Aa][Mm][Ee]\\s*=\\s*[\"']" + quotedArg
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/modifier/TestURLRewritingModifier.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/modifier/TestURLRewritingModifier.java?rev=1037342&r1=1037341&r2=1037342&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/modifier/TestURLRewritingModifier.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/modifier/TestURLRewritingModifier.java
Sat Nov 20 21:59:16 2010
@@ -106,6 +106,32 @@ public class TestURLRewritingModifier ex
assertEquals("jfdkjdkfjddkfdfjkdjfdf", ((Argument)
args.getArguments().get(0).getObjectValue()).getValue());
}
+ public void testGrabSessionIdFromXMLNonPatExtension() throws Exception
{ // Bug 50286
+ String html = "<url>/some/path;jsessionid=123456789</url>";
+ response = new SampleResult();
+ response.setResponseData(html, null);
+ mod.setArgumentName("jsessionid");
+ HTTPSamplerBase sampler = createSampler();
+ context.setCurrentSampler(sampler);
+ context.setPreviousResult(response);
+ mod.process();
+ Arguments args = sampler.getArguments();
+ assertEquals("123456789", ((Argument)
args.getArguments().get(0).getObjectValue()).getValue());
+ }
+
+ public void testGrabSessionIdFromXMLPatExtension() throws Exception {
// Bug 50286
+ String html = "<url>/some/path;jsessionid=123456789</url>";
+ response = new SampleResult();
+ response.setResponseData(html, null);
+ mod.setArgumentName("jsessionid");
+ mod.setPathExtension(true);
+ HTTPSamplerBase sampler = createSampler();
+ context.setCurrentSampler(sampler);
+ context.setPreviousResult(response);
+ mod.process();
+ assertEquals("index.html;jsessionid=123456789",sampler.getPath());
+ }
+
public void testGrabSessionIdEndedInTab() throws Exception {
String html =
"href='index.html?session_id=jfdkjdkfjddkfdfjkdjfdf\t";
response = new SampleResult();
@@ -123,7 +149,7 @@ public class TestURLRewritingModifier ex
String html =
"href='index.html;%24sid%24KQNq3AAADQZoEQAxlkX8uQV5bjqVBPbT'";
response = new SampleResult();
response.setResponseData(html, null);
- mod.setArgumentName("%24sid%24");
+ mod.setArgumentName("%24sid%24"); // $sid$
mod.setPathExtension(true);
mod.setPathExtensionNoEquals(true);
HTTPSamplerBase sampler = createSampler();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
