jsalvata 2003/12/03 15:20:10
Modified: src/protocol/http/org/apache/jmeter/protocol/http/parser
RegexpHTMLParser.java
Log:
Fixed unit test failure I just introduced. Sorry for that.
Revision Changes Path
1.8 +4 -4
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
Index: RegexpHTMLParser.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RegexpHTMLParser.java 3 Dec 2003 23:00:50 -0000 1.7
+++ RegexpHTMLParser.java 3 Dec 2003 23:20:09 -0000 1.8
@@ -126,7 +126,7 @@
* in the web and all browsers seem to understand them.
*/
private static final String VALUE=
- "\\s*=\\s*(?:\"([^\"]*)\"|'([^']*)'|([^\"'\\s][^\\s]*))";
+ "\\s*=\\s*(?:\"([^\"]*)\"|'([^']*)'|([^\"'\\s>][^\\s>]*)(?=[\\s>]))";
// Note there's 3 capturing groups per value
/**
@@ -146,8 +146,8 @@
+ "|APPLET"+SEP+"CODE(?:BASE)?"+VALUE
+ "|(?:EMBED|OBJECT)"+SEP+"(?:SRC|CODEBASE)"+VALUE
+ "|(?:BODY|TABLE|TR|TD)"+SEP+"BACKGROUND"+VALUE
- +
"|INPUT(?:"+SEP+"(?:SRC"+VALUE+"|TYPE\\s*=\\s*[\"']?image(?=[\"'\\s>]))){2,}"
- +
"|LINK(?:"+SEP+"(?:HREF"+VALUE+"|REL\\s*=\\s*[\"']?stylesheet(?=[\"'\\s>]))){2,}"
+ +
"|INPUT(?:"+SEP+"(?:SRC"+VALUE+"|TYPE\\s*=\\s*(?:\"image\"|'image'|image(?=[\\s>])))){2,}"
+ +
"|LINK(?:"+SEP+"(?:HREF"+VALUE+"|REL\\s*=\\s*(?:\"stylesheet\"|'stylesheet'|stylesheet(?=[\\s>])))){2,}"
+ ")";
// Number of capturing groups possibly containing Base HREFs:
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
