Skip to content

Update HTML parser to pick up preload attribute for rel #5947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
matthewt-assurity wants to merge 1 commit into from
Closed

Update HTML parser to pick up preload attribute for rel #5947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/HTMLParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ public abstract class HTMLParser extends BaseParser {

protected static final String SHORTCUT_ICON = "shortcut icon";
protected static final String ICON = "icon";
protected static final String PRELOAD = "preload";

protected static final String IE_UA = "MSIE ([0-9]+.[0-9]+)";// $NON-NLS-1$
protected static final Pattern IE_UA_PATTERN = Pattern.compile(IE_UA);
Expand Down
3 changes: 2 additions & 1 deletion src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,8 @@ private static URL scanNodes(Node node, URLCollection urls, URL baseUrl) throws
if (TAG_LINK.equalsIgnoreCase(name) &&
(STYLESHEET.equalsIgnoreCase(getValue(attrs, ATT_REL))
|| SHORTCUT_ICON.equalsIgnoreCase(getValue(attrs, ATT_REL))
|| ICON.equalsIgnoreCase(getValue(attrs, ATT_REL)))) {
|| ICON.equalsIgnoreCase(getValue(attrs, ATT_REL))
|| PRELOAD.equalsIgnoreCase(getValue(attrs, ATT_REL)))) {
urls.addURL(getValue(attrs, ATT_HREF), baseUrl);
break;
}
Expand Down
6 changes: 4 additions & 2 deletions ...tocol/http/src/main/java/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,10 @@ public void head(Node node, int depth) {
} else if (tagName.equals(TAG_LINK)) {
String relAttr = tag.attr(ATT_REL);
// Putting the string first means it works even if the attribute is null
if (STYLESHEET.equalsIgnoreCase(relAttr) || ICON.equalsIgnoreCase(relAttr)
|| SHORTCUT_ICON.equalsIgnoreCase(relAttr)) {
if (STYLESHEET.equalsIgnoreCase(relAttr)
|| ICON.equalsIgnoreCase(relAttr)
|| SHORTCUT_ICON.equalsIgnoreCase(relAttr)
|| PRELOAD.equalsIgnoreCase(relAttr)) {
extractAttribute(tag, ATT_HREF);
}
} else {
Expand Down
3 changes: 2 additions & 1 deletion ...col/http/src/main/java/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ public void tag(Tag tag) {
if (relAttribute != null &&
(CharSequenceUtil.equalsIgnoreCase(STYLESHEET,relAttribute)
|| CharSequenceUtil.equalsIgnoreCase(ICON, relAttribute)
|| CharSequenceUtil.equalsIgnoreCase(SHORTCUT_ICON, relAttribute))) {
|| CharSequenceUtil.equalsIgnoreCase(SHORTCUT_ICON, relAttribute)
|| CharSequenceUtil.equalsIgnoreCase(PRELOAD, relAttribute))) {
extractAttribute(tag, ATT_HREF);
}
} else {
Expand Down