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 2007/03/18 21:47:27 UTC

svn commit: r519689 - in /jakarta/jmeter/branches/rel-2-2: build.xml src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java xdocs/changes.xml

Author: sebb
Date: Sun Mar 18 13:47:27 2007
New Revision: 519689

URL: http://svn.apache.org/viewvc?view=rev&rev=519689
Log:
Bug 40589- Unescape XML entities in embedded URLs

Modified:
    jakarta/jmeter/branches/rel-2-2/build.xml
    jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java
    jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml

Modified: jakarta/jmeter/branches/rel-2-2/build.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/build.xml?view=diff&rev=519689&r1=519688&r2=519689
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/build.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/build.xml Sun Mar 18 13:47:27 2007
@@ -347,6 +347,7 @@
     <pathelement location="${commons-collections.jar}"/>
     <pathelement location="${commons-httpclient.jar}"/>
     <pathelement location="${commons-jexl.jar}"/>
+    <pathelement location="${commons-lang.jar}"/>
     <pathelement location="${commons-logging.jar}"/>
     <pathelement location="${excalibur-compatibility.jar}"/>
     <pathelement location="${excalibur-datasource.jar}"/>

Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java?view=diff&rev=519689&r1=519688&r2=519689
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java (original)
+++ jakarta/jmeter/branches/rel-2-2/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java Sun Mar 18 13:47:27 2007
@@ -23,6 +23,8 @@
 import java.util.Collection;
 import java.util.Iterator;
 
+import org.apache.commons.lang.StringEscapeUtils;
+
 /**
  * Collection class designed for handling URLs
  * 
@@ -85,6 +87,8 @@
 	public boolean addURL(String url, URL baseUrl) {
 		if (url == null || url.length() == 0)
 			return false;
+		//url.replace('+',' ');
+		url=StringEscapeUtils.unescapeXml(url);
 		boolean b = false;
 		try {
 			b = this.add(new URL(baseUrl, url));

Modified: jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml?view=diff&rev=519689&r1=519688&r2=519689
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Sun Mar 18 13:47:27 2007
@@ -187,6 +187,7 @@
 <li>Bug 40325 - allow specification of proxyuser and proxypassword for WebServiceSampler</li>
 <li>Change HttpClient proxy definition to use NTCredentials; added http.proxyDomain property for this</li>
 <li>Bug 40371 - response assertion "pattern to test" scrollbar problem</li>
+<li>Bug 40589- Unescape XML entities in embedded URLs</li>
 </ul>
 
 <h3>Version 2.2</h3>



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