hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1735108 - /httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java
Date Tue, 15 Mar 2016 15:26:32 GMT
Author: olegk
Date: Tue Mar 15 15:26:32 2016
New Revision: 1735108

URL: http://svn.apache.org/viewvc?rev=1735108&view=rev
Log:
Revert "HTTPCLIENT-1712: SPNego schemes to take service scheme into account when generating
auth token"

This reverts commit 1d50c1a1a16ee6f9c5930d966f1b234d98bf261f.

Modified:
    httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java

Modified: httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java?rev=1735108&r1=1735107&r2=1735108&view=diff
==============================================================================
--- httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java
(original)
+++ httpcomponents/httpclient/branches/4.5.x/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java
Tue Mar 15 15:26:32 2016
@@ -28,7 +28,6 @@ package org.apache.http.impl.auth;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import java.util.Locale;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.logging.Log;
@@ -80,7 +79,6 @@ public abstract class GGSSchemeBase exte
 
     /** base64 decoded challenge **/
     private byte[] token;
-    private String service;
 
     GGSSchemeBase(final boolean stripPort, final boolean useCanonicalHostname) {
         super();
@@ -118,7 +116,7 @@ public abstract class GGSSchemeBase exte
             inputBuff = new byte[0];
         }
         final GSSManager manager = getManager();
-        final GSSName serverName = manager.createName(service + "@" + authServer, GSSName.NT_HOSTBASED_SERVICE);
+        final GSSName serverName = manager.createName("HTTP@" + authServer, GSSName.NT_HOSTBASED_SERVICE);
 
         final GSSCredential gssCredential;
         if (credentials instanceof KerberosCredentials) {
@@ -214,8 +212,6 @@ public abstract class GGSSchemeBase exte
                     authServer = hostname + ":" + host.getPort();
                 }
 
-                service = host.getSchemeName().toUpperCase(Locale.ROOT);
-
                 if (log.isDebugEnabled()) {
                     log.debug("init " + authServer);
                 }



Mime
View raw message