svn commit: r947489 - /ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/HttpClientHandler.java

[maartenc]

Author: maartenc
Date: Sun May 23 20:23:13 2010
New Revision: 947489

URL: http://svn.apache.org/viewvc?rev=947489&view=rev
Log:
Second attempt to fix regressions with authentication proxies with realm 
information.

Modified:
    ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/HttpClientHandler.java

Modified: 
ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/HttpClientHandler.java
URL: 
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/HttpClientHandler.java?rev=947489&r1=947488&r2=947489&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/HttpClientHandler.java 
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/util/url/HttpClientHandler.java 
Sun May 23 20:23:13 2010
@@ -79,7 +79,7 @@ public class HttpClientHandler extends A
     }
 
     private void configureProxy() {
-        proxyRealm = System.getProperty("http.auth.ntlm.domain", 
AuthScope.ANY_REALM);
+        proxyRealm = System.getProperty("http.auth.ntlm.domain");
         // no equivalent for realm in jdk proxy support ?
         proxyHost = System.getProperty("http.proxyHost");
         // TODO constant is better ...
@@ -284,7 +284,7 @@ public class HttpClientHandler extends A
                 httpClient.getHostConfiguration().setProxy(proxyHost, 
proxyPort);
                 if (useProxyAuthentication()) {
                     httpClient.getState().setProxyCredentials(
-                        new AuthScope(proxyHost, proxyPort, proxyRealm),
+                        new AuthScope(proxyHost, proxyPort, 
AuthScope.ANY_REALM),
                         new NTCredentials(proxyUserName, proxyPasswd, 
                             HostUtil.getLocalHostName(), proxyRealm));
                 }