Author: fschumacher
Date: Sat Jan 28 14:31:46 2017
New Revision: 1780701
URL: http://svn.apache.org/viewvc?rev=1780701&view=rev
Log:
Remove workaround for https://issues.apache.org/jira/browse/HTTPCLIENT-1712
regarding SPNego for kerberos and HTTPS, which was introduced in
httpclient 4.5.2 and has beeen fixed with 4.5.3.
As we are now using httpclient 4.5.3, the workaround is not needed anymore.
Note, that httpclient has decided not to set mutual auth and delegation on the
GSSScheme.
If this causes problems, we would have to re-use our workaround.
Removed:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/FixedSPNegoScheme.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/FixedSPNegoSchemeFactory.java
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java?rev=1780701&r1=1780700&r2=1780701&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
Sat Jan 28 14:31:46 2017
@@ -39,6 +39,7 @@ import org.apache.http.auth.NTCredential
import org.apache.http.client.CredentialsProvider;
import org.apache.http.client.HttpClient;
import org.apache.http.client.config.AuthSchemes;
+import org.apache.http.impl.auth.SPNegoSchemeFactory;
import org.apache.http.impl.client.AbstractHttpClient;
import org.apache.jmeter.config.ConfigElement;
import org.apache.jmeter.config.ConfigTestElement;
@@ -470,7 +471,7 @@ public class AuthManager extends ConfigT
if (Mechanism.KERBEROS.equals(auth.getMechanism())) {
((AbstractHttpClient) client).getAuthSchemes().register(
AuthSchemes.SPNEGO,
- new FixedSPNegoSchemeFactory(isStripPort(url)));
+ new SPNegoSchemeFactory(isStripPort(url)));
credentialsProvider.setCredentials(new AuthScope(null, -1,
null), USE_JAAS_CREDENTIALS);
} else {
credentialsProvider.setCredentials(
