You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by kw...@apache.org on 2012/12/18 09:14:26 UTC
svn commit: r1423314 - in /httpcomponents/httpclient/trunk: RELEASE_NOTES.txt
httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
Author: kwright
Date: Tue Dec 18 08:14:25 2012
New Revision: 1423314
URL: http://svn.apache.org/viewvc?rev=1423314&view=rev
Log:
Another fix related to HTTPCLIENT-1268. Get flags for when to send NTLMv2 response correct.
Modified:
httpcomponents/httpclient/trunk/RELEASE_NOTES.txt
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
Modified: httpcomponents/httpclient/trunk/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/RELEASE_NOTES.txt?rev=1423314&r1=1423313&r2=1423314&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/RELEASE_NOTES.txt (original)
+++ httpcomponents/httpclient/trunk/RELEASE_NOTES.txt Tue Dec 18 08:14:25 2012
@@ -26,7 +26,8 @@ Changes in trunk
* [HTTPCLIENT-1080] NTLM dead code commented out.
Contributed by Karl Wright <DaddyWri at gmail.com>
-* [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 <DaddyWri at gmail.com>
* [HTTPCLIENT-1263] BrowserCompatSpec: attribute values containing spaces or special characters
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java?rev=1423314&r1=1423313&r2=1423314&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java Tue Dec 18 08:14:25 2012
@@ -1149,7 +1149,6 @@ final class NTLMEngineImpl implements NT
byte[] userSessionKey;
try {
if (((type2Flags & FLAG_REQUEST_NTLM2_SESSION) == 0) &&
- ((type2Flags & FLAG_REQUEST_NTLMv1) == 0) &&
targetInformation != null && target != null) {
// NTLMv2
ntResp = gen.getNTLMv2Response();