@@ -637,7 +637,7 @@ private static HttpRequest construct(AsyncHttpClientConfig config,
637637 if (!(auth != null && auth .size () > 0 && auth .get (0 ).startsWith ("NTLM" ))) {
638638 try {
639639 String msg = ntlmEngine .generateType1Msg (proxyServer .getNtlmDomain (),
640- proxyServer .getHost ());
640+ proxyServer .getHost ());
641641 nettyRequest .setHeader (HttpHeaders .Names .PROXY_AUTHORIZATION , "NTLM " + msg );
642642 } catch (NTLMEngineException e ) {
643643 IOException ie = new IOException ();
@@ -647,7 +647,7 @@ private static HttpRequest construct(AsyncHttpClientConfig config,
647647 }
648648 } else {
649649 nettyRequest .setHeader (HttpHeaders .Names .PROXY_AUTHORIZATION ,
650- AuthenticatorUtils .computeBasicAuthentication (proxyServer ));
650+ AuthenticatorUtils .computeBasicAuthentication (proxyServer ));
651651 }
652652 }
653653 }
@@ -845,12 +845,12 @@ private <T> ListenableFuture<T> doConnect(final Request request, final AsyncHand
845845
846846 boolean useSSl = uri .getScheme ().compareToIgnoreCase (HTTPS ) == 0 && proxyServer == null ;
847847 if (channel != null && channel .isOpen () && channel .isConnected ()) {
848- HttpRequest nettyRequest = buildRequest (config , request , uri , f == null ? false : f .isConnectAllowed (), bufferedBytes );
848+ HttpRequest nettyRequest = buildRequest (config , request , uri , f == null ? false : f .isConnectAllowed (), bufferedBytes );
849849
850850 if (f == null ) {
851851 f = newFuture (uri , request , asyncHandler , nettyRequest , config , this );
852852 } else {
853- nettyRequest = buildRequest (config , request , uri , f .isConnectAllowed (), bufferedBytes );
853+ nettyRequest = buildRequest (config , request , uri , f .isConnectAllowed (), bufferedBytes );
854854 f .setNettyRequest (nettyRequest );
855855 }
856856 f .setState (NettyResponseFuture .STATE .POOLED );
@@ -927,10 +927,9 @@ private <T> ListenableFuture<T> doConnect(final Request request, final AsyncHand
927927 }
928928
929929 try {
930- if (request .getInetAddress () != null ) {
931- channelFuture = bootstrap .connect (new InetSocketAddress (request .getInetAddress (), AsyncHttpProviderUtils .getPort (uri )));
932- }
933- else if (proxyServer == null || avoidProxy ) {
930+ if (request .getInetAddress () != null ) {
931+ channelFuture = bootstrap .connect (new InetSocketAddress (request .getInetAddress (), AsyncHttpProviderUtils .getPort (uri )));
932+ } else if (proxyServer == null || avoidProxy ) {
934933 channelFuture = bootstrap .connect (new InetSocketAddress (AsyncHttpProviderUtils .getHost (uri ), AsyncHttpProviderUtils .getPort (uri )));
935934 } else {
936935 channelFuture = bootstrap .connect (new InetSocketAddress (proxyServer .getHost (), proxyServer .getPort ()));
@@ -1181,7 +1180,7 @@ public Object call() throws Exception {
11811180 log .debug ("Sending proxy authentication to {}" , request .getUrl ());
11821181
11831182 future .setState (NettyResponseFuture .STATE .NEW );
1184-
1183+
11851184 if (!proxyAuth .contains ("Kerberos" ) && (proxyAuth .get (0 ).contains ("NTLM" ) || (proxyAuth .contains ("Negotiate" )))) {
11861185 newRealm = ntlmProxyChallenge (proxyAuth , request , proxyServer , headers , realm , future );
11871186 // SPNEGO KERBEROS
@@ -1409,14 +1408,14 @@ private Realm ntlmChallenge(List<String> wwwAuth,
14091408 realmBuilder = new Realm .RealmBuilder ();
14101409 }
14111410 newRealm = realmBuilder .setScheme (realm .getAuthScheme ())
1412- .setUri (URI .create (request .getUrl ()).getPath ())
1413- .setMethodName (request .getMethod ())
1414- .build ();
1411+ .setUri (URI .create (request .getUrl ()).getPath ())
1412+ .setMethodName (request .getMethod ())
1413+ .build ();
14151414 }
14161415
14171416 return newRealm ;
14181417 }
1419-
1418+
14201419 private Realm ntlmProxyChallenge (List <String > wwwAuth ,
14211420 Request request ,
14221421 ProxyServer proxyServer ,
@@ -1429,10 +1428,10 @@ private Realm ntlmProxyChallenge(List<String> wwwAuth,
14291428 if (wwwAuth .get (0 ).startsWith ("NTLM " )) {
14301429 String serverChallenge = wwwAuth .get (0 ).trim ().substring ("NTLM " .length ());
14311430 String challengeHeader = ntlmEngine .generateType3Msg (proxyServer .getPrincipal (),
1432- proxyServer .getPassword (),
1433- proxyServer .getNtlmDomain (),
1434- proxyServer .getHost (),
1435- serverChallenge );
1431+ proxyServer .getPassword (),
1432+ proxyServer .getNtlmDomain (),
1433+ proxyServer .getHost (),
1434+ serverChallenge );
14361435 headers .add (HttpHeaders .Names .PROXY_AUTHORIZATION , "NTLM " + challengeHeader );
14371436 }
14381437 Realm newRealm ;
@@ -1443,9 +1442,9 @@ private Realm ntlmProxyChallenge(List<String> wwwAuth,
14431442 realmBuilder = new Realm .RealmBuilder ();
14441443 }
14451444 newRealm = realmBuilder //.setScheme(realm.getAuthScheme())
1446- .setUri (URI .create (request .getUrl ()).getPath ())
1447- .setMethodName (request .getMethod ())
1448- .build ();
1445+ .setUri (URI .create (request .getUrl ()).getPath ())
1446+ .setMethodName (request .getMethod ())
1447+ .build ();
14491448
14501449 return newRealm ;
14511450 }
0 commit comments