diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index 3b586fad7..307c54278 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -26,7 +26,8 @@ Changes in trunk * [HTTPCLIENT-1080] NTLM dead code commented out. Contributed by Karl Wright -* [HTTPCLIENT-1268] NTLM engine refactor fix, to correct a buffer overrun. +* [HTTPCLIENT-1268] NTLM engine refactor fix, to correct a buffer overrun, and get + flags right for when NTLMv2 response should be sent. Contributed by Karl Wright * [HTTPCLIENT-1263] BrowserCompatSpec: attribute values containing spaces or special characters diff --git a/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java b/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java index a3cd0bdaf..59fd8cebb 100644 --- a/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java +++ b/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java @@ -1149,7 +1149,6 @@ final class NTLMEngineImpl implements NTLMEngine { byte[] userSessionKey; try { if (((type2Flags & FLAG_REQUEST_NTLM2_SESSION) == 0) && - ((type2Flags & FLAG_REQUEST_NTLMv1) == 0) && targetInformation != null && target != null) { // NTLMv2 ntResp = gen.getNTLMv2Response();