Author: pmouawad
Date: Mon Jan 14 23:05:39 2019
New Revision: 1851307
URL: http://svn.apache.org/viewvc?rev=1851307&view=rev
Log:
Bug 63048 - JMeter does not retrieve link resources of type "shortcut icon" or
"icon"
Fix test failure (last one)
Bugzilla Id: 63048
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java?rev=1851307&r1=1851306&r2=1851307&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java
Mon Jan 14 23:05:39 2019
@@ -103,10 +103,9 @@ class RegexpHTMLParser extends HTMLParse
+ "|[^<]+?STYLE\\s*=['\"].*?URL\\(\\s*['\"](.+?)['\"]\\s*\\)"
+ "|INPUT(?:" + SEP + "(?:SRC" + VALUE
+ "|TYPE\\s*=\\s*(?:\"image\"|'image'|image(?=[\\s>])))){2,}"
- + "|LINK(?:" + SEP + "(?:HREF" + VALUE
- +
"|REL\\s*=\\s*(?:\"stylesheet\"|'stylesheet'|stylesheet(?=[\\s>])))){2,}"
- + "|REL\\s*=\\s*(?:\"icon\"|'icon'|icon(?=[\\s>])))){2,}"
- + "|REL\\s*=\\s*(?:\"shortcut icon\"|'shortcut icon'|shortcut
icon(?=[\\s>])))){2,}" + ")";
+ + "|LINK(?:" + SEP + "(?:HREF" +
VALUE+"|REL\\s*=\\s*(?:\"stylesheet\"|'stylesheet'|stylesheet(?=[\\s>])))){2,}"
+ + "|LINK(?:" + SEP + "(?:HREF" +
VALUE+"|REL\\s*=\\s*(?:\"icon\"|'icon'|icon(?=[\\s>])))){2,}"
+ + "|LINK(?:" + SEP + "(?:HREF" + VALUE+"|REL\\s*=\\s*(?:\"shortcut
icon\"|'shortcut icon'|shortcut icon(?=[\\s>])))){2,})";
// Number of capturing groups possibly containing Base HREFs:
private static final int NUM_BASE_GROUPS = 3;
