Author: olegk
Date: Wed Apr 13 20:27:27 2011
New Revision: 1091904
URL: http://svn.apache.org/viewvc?rev=1091904&view=rev
Log:
HTTPCLIENT-1079: Fixed Kerberos cross-realm support
Contributed by Michael Osipov <1983-01-06 at gmx.net>
Modified:
httpcomponents/httpclient/trunk/RELEASE_NOTES.txt
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java
Modified: httpcomponents/httpclient/trunk/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/RELEASE_NOTES.txt?rev=1091904&r1=1091903&r2=1091904&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/RELEASE_NOTES.txt (original)
+++ httpcomponents/httpclient/trunk/RELEASE_NOTES.txt Wed Apr 13 20:27:27 2011
@@ -1,5 +1,8 @@
Changes since 4.1.1
+* [HTTPCLIENT-1079] Fixed Kerberos cross-realm support
+ Contributed by Michael Osipov <1983-01-06 at gmx.net>
+
* [HTTPCLIENT-1078] Decompressing entities (DeflateDecompressingEntity, GzipDecompressingEntity)
do not close content stream in #writeTo() method.
Contributed by Oleg Kalnichevski <olegk at apache.org>
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java?rev=1091904&r1=1091903&r2=1091904&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java Wed Apr 13 20:27:27 2011
@@ -198,7 +198,7 @@ public class NegotiateScheme extends Aut
boolean tryKerberos = false;
try {
GSSManager manager = getManager();
- GSSName serverName = manager.createName("HTTP/" + authServer, null);
+ GSSName serverName = manager.createName("HTTP@" + authServer, GSSName.NT_HOSTBASED_SERVICE);
gssContext = manager.createContext(
serverName.canonicalize(negotiationOid), negotiationOid, null,
GSSContext.DEFAULT_LIFETIME);
@@ -220,7 +220,7 @@ public class NegotiateScheme extends Aut
log.debug("Using Kerberos MECH " + KERBEROS_OID);
negotiationOid = new Oid(KERBEROS_OID);
GSSManager manager = getManager();
- GSSName serverName = manager.createName("HTTP/" + authServer, null);
+ GSSName serverName = manager.createName("HTTP@" + authServer, GSSName.NT_HOSTBASED_SERVICE);
gssContext = manager.createContext(
serverName.canonicalize(negotiationOid), negotiationOid, null,
GSSContext.DEFAULT_LIFETIME);