Skip to content

Commit 40234b0

Browse files
author
Stephane Landelle
committed
Fix NTLM, close AsyncHttpClient#730
1 parent b142fa7 commit 40234b0

File tree

7 files changed

+724
-403
lines changed

7 files changed

+724
-403
lines changed

src/main/java/com/ning/http/client/Realm.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ public class Realm {
5050
private final boolean usePreemptiveAuth;
5151
private final Charset charset;
5252
private final String host;
53-
private final boolean messageType2Received;
5453
private final boolean useAbsoluteURI;
5554
private final boolean omitQuery;
5655
private final boolean targetProxy;
@@ -82,7 +81,6 @@ private Realm(AuthScheme scheme,
8281
String ntlmDomain,
8382
Charset charset,
8483
String host,
85-
boolean messageType2Received,
8684
String opaque,
8785
boolean useAbsoluteURI,
8886
boolean omitQuery,
@@ -105,7 +103,6 @@ private Realm(AuthScheme scheme,
105103
this.ntlmDomain = ntlmDomain;
106104
this.charset = charset;
107105
this.host = host;
108-
this.messageType2Received = messageType2Received;
109106
this.useAbsoluteURI = useAbsoluteURI;
110107
this.omitQuery = omitQuery;
111108
this.targetProxy = targetProxy;
@@ -199,10 +196,6 @@ public String getNtlmHost() {
199196
return host;
200197
}
201198

202-
public boolean isNtlmMessageType2Received() {
203-
return messageType2Received;
204-
}
205-
206199
public boolean isUseAbsoluteURI() {
207200
return useAbsoluteURI;
208201
}
@@ -302,7 +295,6 @@ public static class RealmBuilder {
302295
private String ntlmDomain = System.getProperty("http.auth.ntlm.domain", "");
303296
private Charset charset = UTF_8;
304297
private String host = "localhost";
305-
private boolean messageType2Received = false;
306298
private boolean useAbsoluteURI = true;
307299
private boolean omitQuery = false;
308300
private boolean targetProxy = false;
@@ -501,11 +493,6 @@ public RealmBuilder parseProxyAuthenticateHeader(String headerLine) {
501493
return this;
502494
}
503495

504-
public RealmBuilder setNtlmMessageType2Received(boolean messageType2Received) {
505-
this.messageType2Received = messageType2Received;
506-
return this;
507-
}
508-
509496
public RealmBuilder clone(Realm clone) {
510497
setRealmName(clone.getRealmName());
511498
setAlgorithm(clone.getAlgorithm());
@@ -522,7 +509,6 @@ public RealmBuilder clone(Realm clone) {
522509
setUsePreemptiveAuth(clone.getUsePreemptiveAuth());
523510
setNtlmDomain(clone.getNtlmDomain());
524511
setNtlmHost(clone.getNtlmHost());
525-
setNtlmMessageType2Received(clone.isNtlmMessageType2Received());
526512
setUseAbsoluteURI(clone.isUseAbsoluteURI());
527513
setOmitQuery(clone.isOmitQuery());
528514
setTargetProxy(clone.isTargetProxy());
@@ -676,7 +662,6 @@ public Realm build() {
676662
ntlmDomain,
677663
charset,
678664
host,
679-
messageType2Received,
680665
opaque,
681666
useAbsoluteURI,
682667
omitQuery,

0 commit comments

Comments
 (0)