Redirects with underscore character in the location hostname cause IllegalArgumentException

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1467942 13f79535-47bb-0310-9956-ffa450edef68

RELEASE_NOTES.txt

@@ -1,6 +1,10 @@
 Changes since release 4.3 BETA1
 -------------------
 
+* [HTTPCLIENT-1342] Redirects with underscore character in the location hostname cause
+  "java.lang.IllegalArgumentException: Host name may not be null".  
+  Contributed by Oleg Kalnichevski <olegk at apache.org>
+
 * [HTTPCLIENT-1338] (regression) Invalidated / stale DIGEST schemes do not get evicted from
   the auth cache. 
   Contributed by Oleg Kalnichevski <olegk at apache.org>

httpclient/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java

@@ -462,8 +462,7 @@ public class DefaultRequestDirector implements RequestDirector {
                 } else {
                     final URI requestURI = wrapper.getURI();
                     if (requestURI.isAbsolute()) {
-                        target = new HttpHost(
-                            requestURI.getHost(), requestURI.getPort(), requestURI.getScheme());
+                        target = URIUtils.extractHost(requestURI);
                     }
                 }
                 if (target == null) {

httpclient/src/main/java/org/apache/http/impl/execchain/RedirectExec.java

@@ -113,7 +113,7 @@ public class RedirectExec implements ClientExecChain {
 
                     final URI uri = currentRequest.getURI();
                     final HttpHost newTarget = URIUtils.extractHost(uri);
-                    if (uri.getHost() == null) {
+                    if (newTarget == null) {
                         throw new ProtocolException("Redirect URI does not specify a valid host name: " +
                                 uri);
                     }