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:12:11 UTC
svn commit: r1423313 - in /httpcomponents/httpclient/branches/4.2.x:
RELEASE_NOTES.txt
httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
Author: kwright
Date: Tue Dec 18 08:12:11 2012
New Revision: 1423313
URL: http://svn.apache.org/viewvc?rev=1423313&view=rev
Log:
Another fix related to HTTPCLIENT-1268. Get flags for when to send NTLMv2 response correct.
Modified:
httpcomponents/httpclient/branches/4.2.x/RELEASE_NOTES.txt
httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
Modified: httpcomponents/httpclient/branches/4.2.x/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.2.x/RELEASE_NOTES.txt?rev=1423313&r1=1423312&r2=1423313&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.2.x/RELEASE_NOTES.txt (original)
+++ httpcomponents/httpclient/branches/4.2.x/RELEASE_NOTES.txt Tue Dec 18 08:12:11 2012
@@ -27,7 +27,8 @@ Changes since 4.2.2
protocol interceptor leading to a potential connection leak.
Contributed by Oleg Kalnichevski <olegk at apache.org>
-* [HTTPCLIENT-1268] NTLM engine refactor fix, to correct a buffer overrun.
+* [HTTPCLIENT-1268] NTLM engine refactor fix, to correct a buffer overrun, and get NTLMv2
+ flags right.
Contributed by Karl Wright <DaddyWri at gmail.com>
* [HTTPCLIENT-1266] NTLM engine refactoring and compatibility improvements.
Modified: httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java?rev=1423313&r1=1423312&r2=1423313&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java (original)
+++ httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java Tue Dec 18 08:12:11 2012
@@ -1149,8 +1149,9 @@ final class NTLMEngineImpl implements NT
// seems warranted.
byte[] userSessionKey;
try {
+ // This conditional may not work on Windows Server 2008 R2 and above, where it has not yet
+ // been tested
if (((type2Flags & FLAG_REQUEST_NTLM2_SESSION) == 0) &&
- ((type2Flags & FLAG_REQUEST_NTLMv1) == 0) &&
targetInformation != null && target != null) {
// NTLMv2
ntResp = gen.getNTLMv2Response();