You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2011/04/13 22:31:09 UTC
svn commit: r1091905 - in /httpcomponents/httpclient/branches/4.1.x: ./
RELEASE_NOTES.txt httpclient/
httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java
Author: olegk
Date: Wed Apr 13 20:31:08 2011
New Revision: 1091905
URL: http://svn.apache.org/viewvc?rev=1091905&view=rev
Log:
HTTPCLIENT-1079: Fixed Kerberos cross-realm support
Contributed by Michael Osipov <1983-01-06 at gmx.net>
Modified:
httpcomponents/httpclient/branches/4.1.x/ (props changed)
httpcomponents/httpclient/branches/4.1.x/RELEASE_NOTES.txt
httpcomponents/httpclient/branches/4.1.x/httpclient/ (props changed)
httpcomponents/httpclient/branches/4.1.x/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java
Propchange: httpcomponents/httpclient/branches/4.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 13 20:31:08 2011
@@ -1,4 +1,4 @@
/httpcomponents/httpclient/branches/4.0.x:950681-950688
/httpcomponents/httpclient/branches/branch_4_1:755593-811107
/httpcomponents/httpclient/branches/notice-plugin-test:1024348-1031454
-/httpcomponents/httpclient/trunk:1087358,1091140-1091141
+/httpcomponents/httpclient/trunk:1087358,1091140-1091141,1091904
Modified: httpcomponents/httpclient/branches/4.1.x/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.1.x/RELEASE_NOTES.txt?rev=1091905&r1=1091904&r2=1091905&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.1.x/RELEASE_NOTES.txt (original)
+++ httpcomponents/httpclient/branches/4.1.x/RELEASE_NOTES.txt Wed Apr 13 20:31:08 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>
Propchange: httpcomponents/httpclient/branches/4.1.x/httpclient/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 13 20:31:08 2011
@@ -1,4 +1,4 @@
/httpcomponents/httpclient/branches/4.0.x/httpclient:950681-950688
/httpcomponents/httpclient/branches/branch_4_1/httpclient:755593-811107
/httpcomponents/httpclient/branches/notice-plugin-test/httpclient:1024348-1031454
-/httpcomponents/httpclient/trunk/httpclient:1087358,1088000-1088004,1091140-1091141
+/httpcomponents/httpclient/trunk/httpclient:1087358,1088000-1088004,1091140-1091141,1091904
Modified: httpcomponents/httpclient/branches/4.1.x/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.1.x/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java?rev=1091905&r1=1091904&r2=1091905&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.1.x/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java (original)
+++ httpcomponents/httpclient/branches/4.1.x/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java Wed Apr 13 20:31:08 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);