Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HTTPCLIENT-755: Workaround for known bugs in java.net.URI.resolve() (Bug ID: 4708535) 

Contributed by Johannes Koch <johannes.koch at fit.fraunhofer.de>


git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@632273 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2008-02-29 09:43:28 +00:00
parent a24d0b2de1
commit 2588e16238
3 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
RELEASE_NOTES.txt
View File

@ -1,3 +1,10 @@
Changes since 4.0 Alpha 3
-------------------
* [HTTPCLIENT-755] Workaround for known bugs in java.net.URI.resolve()
Bug ID: 4708535
Contributed by Johannes Koch <johannes.koch at fit.fraunhofer.de>
Release 4.0 Alpha 3
-------------------

40
module-client/src/main/java/org/apache/http/client/utils/URLUtils.java
View File

@ -194,6 +194,46 @@ public class URLUtils {
return rewriteURI(uri, target, false);
}
/**
* Resolves a URI reference against a base URI. Work-around for bug in
* java.net.URI (<http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4708535>)
*
* @param baseURI the base URI
* @param reference the URI reference
* @return the resulting URI
*/
public static URI resolve(final URI baseURI, final String reference) {
return URLUtils.resolve(baseURI, URI.create(reference));
}
/**
* Resolves a URI reference against a base URI. Work-around for bug in
* java.net.URI (<http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4708535>)
*
* @param baseURI the base URI
* @param reference the URI reference
* @return the resulting URI
*/
public static URI resolve(final URI baseURI, URI reference){
if (baseURI == null) {
throw new IllegalArgumentException("Base URI may nor be null");
}
if (reference == null) {
throw new IllegalArgumentException("Reference URI may nor be null");
}
boolean emptyReference = reference.toString().length() == 0;
if (emptyReference) {
reference = URI.create("#");
}
URI resolved = baseURI.resolve(reference);
if (emptyReference) {
String resolvedString = resolved.toString();
resolved = URI.create(resolvedString.substring(0,
resolvedString.indexOf('#')));
}
return resolved;
}
/**
* This class should not be instantiated.
*/

2
module-client/src/main/java/org/apache/http/impl/client/DefaultRedirectHandler.java
View File

@ -138,7 +138,7 @@ public class DefaultRedirectHandler implements RedirectHandler {
try {
URI requestURI = new URI(request.getRequestLine().getUri());
URI absoluteRequestURI = URLUtils.rewriteURI(requestURI, target, true);
uri = absoluteRequestURI.resolve(uri);
uri = URLUtils.resolve(absoluteRequestURI, uri);
} catch (URISyntaxException ex) {
throw new ProtocolException(ex.getMessage(), ex);
}