Return-Path: X-Original-To: apmail-hc-commits-archive@www.apache.org Delivered-To: apmail-hc-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 70B8FD1A3 for ; Tue, 18 Dec 2012 08:12:45 +0000 (UTC) Received: (qmail 93702 invoked by uid 500); 18 Dec 2012 08:12:45 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 93525 invoked by uid 500); 18 Dec 2012 08:12:38 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 93460 invoked by uid 99); 18 Dec 2012 08:12:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Dec 2012 08:12:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Dec 2012 08:12:33 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3D7CD2388962 for ; Tue, 18 Dec 2012 08:12:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1423313 - in /httpcomponents/httpclient/branches/4.2.x: RELEASE_NOTES.txt httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java Date: Tue, 18 Dec 2012 08:12:11 -0000 To: commits@hc.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121218081212.3D7CD2388962@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 -* [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 * [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();