You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2006/01/12 03:33:00 UTC

svn commit: r368233 - in /jakarta/jmeter/branches/rel-2-1/src: htmlparser/org/htmlparser/scanners/BaseHrefScanner.java protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParserHTMLParser.java

Author: sebb
Date: Wed Jan 11 18:32:47 2006
New Revision: 368233

URL: http://svn.apache.org/viewcvs?rev=368233&view=rev
Log:
Fix Base Href to not remove trailing slash

Modified:
    jakarta/jmeter/branches/rel-2-1/src/htmlparser/org/htmlparser/scanners/BaseHrefScanner.java
    jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParserHTMLParser.java

Modified: jakarta/jmeter/branches/rel-2-1/src/htmlparser/org/htmlparser/scanners/BaseHrefScanner.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/htmlparser/org/htmlparser/scanners/BaseHrefScanner.java?rev=368233&r1=368232&r2=368233&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/htmlparser/org/htmlparser/scanners/BaseHrefScanner.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/htmlparser/org/htmlparser/scanners/BaseHrefScanner.java Wed Jan 11 18:32:47 2006
@@ -59,7 +59,7 @@
 		String baseUrl = (String) tag.getAttribute("HREF");
 		String absoluteBaseUrl = "";
 		if (baseUrl != null && baseUrl.length() > 0) {
-			absoluteBaseUrl = LinkProcessor.removeLastSlash(baseUrl.trim());
+			absoluteBaseUrl = baseUrl.trim();
 			processor.setBaseUrl(absoluteBaseUrl);
 		}
 		return new BaseHrefTag(tagData, absoluteBaseUrl);

Modified: jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParserHTMLParser.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParserHTMLParser.java?rev=368233&r1=368232&r2=368233&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParserHTMLParser.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParserHTMLParser.java Wed Jan 11 18:32:47 2006
@@ -130,7 +130,7 @@
 					try {
 						if (!baseref.equals(""))// Bugzilla 30713 // $NON-NLS-1$
 						{
-							baseUrl = new URL(baseUrl, baseHref.getBaseUrl() + "/"); // $NON-NLS-1$
+							baseUrl = new URL(baseUrl, baseref);
 						}
 					} catch (MalformedURLException e1) {
 						throw new HTMLParseException(e1);



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org