Author: sebb
Date: Sat Nov 20 21:22:35 2010
New Revision: 1037331
URL: http://svn.apache.org/viewvc?rev=1037331&view=rev
Log:
Matching uses contains, so no point having optional trailing delimiters
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/URLRewritingModifier.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=1037331&r1=1037330&r2=1037331&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:22:35 2010
@@ -147,24 +147,24 @@ public class URLRewritingModifier extend
private void initRegex(String argName) {
String quotedArg = Perl5Compiler.quotemeta(argName);// Don't get
tripped up by RE chars in the arg name
pathExtensionEqualsQuestionmarkRegexp =
JMeterUtils.getPatternCache().getPattern(
- SEMI_COLON + quotedArg + "=([^\"'<>&\\s;]*)[&\\s\"'>;]?$?", //
$NON-NLS-1$
+ SEMI_COLON + quotedArg + "=([^\"'<>&\\s;]*)", // $NON-NLS-1$
Perl5Compiler.MULTILINE_MASK | Perl5Compiler.READ_ONLY_MASK);
pathExtensionEqualsNoQuestionmarkRegexp =
JMeterUtils.getPatternCache().getPattern(
- SEMI_COLON + quotedArg + "=([^\"'<>&\\s;?]*)[&\\s\"'>;?]?$?",
// $NON-NLS-1$
+ SEMI_COLON + quotedArg + "=([^\"'<>&\\s;?]*)", // $NON-NLS-1$
Perl5Compiler.MULTILINE_MASK | Perl5Compiler.READ_ONLY_MASK);
pathExtensionNoEqualsQuestionmarkRegexp =
JMeterUtils.getPatternCache().getPattern(
- SEMI_COLON + quotedArg + "([^\"'<>&\\s;]*)[&\\s\"'>;]?$?", //
$NON-NLS-1$
+ SEMI_COLON + quotedArg + "([^\"'<>&\\s;]*)", // $NON-NLS-1$
Perl5Compiler.MULTILINE_MASK | Perl5Compiler.READ_ONLY_MASK);
pathExtensionNoEqualsNoQuestionmarkRegexp =
JMeterUtils.getPatternCache().getPattern(
- SEMI_COLON + quotedArg + "([^\"'<>&\\s;?]*)[&\\s\"'>;?]?$?",
// $NON-NLS-1$
+ SEMI_COLON + quotedArg + "([^\"'<>&\\s;?]*)", // $NON-NLS-1$
Perl5Compiler.MULTILINE_MASK | Perl5Compiler.READ_ONLY_MASK);
parameterRegexp = JMeterUtils.getPatternCache().getPattern(
// ;sessionid=value
- "[;\\?&]" + quotedArg + "=([^\"'>&\\s;\\\\]*)[&\\s\"'>;]?$?" +
// $NON-NLS-1$
+ "[;\\?&]" + quotedArg + "=([^\"'>&\\s;\\\\]*)" + //
$NON-NLS-1$
// name="sessionid" value="value"
"|\\s[Nn][Aa][Mm][Ee]\\s*=\\s*[\"']" + quotedArg
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
