jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1611028 - in /jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java xdocs/changes.xml
Date Wed, 16 Jul 2014 14:42:18 GMT
Author: pmouawad
Date: Wed Jul 16 14:42:17 2014
New Revision: 1611028

URL: http://svn.apache.org/r1611028
Log:
Bug 56701 - HTTP Authorization Manager/ Kerberos Authentication: add port to SPN when server
port is neither 80 nor 443
Bugzilla Id: 56701

Modified:
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
    jmeter/trunk/xdocs/changes.xml

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=1611028&r1=1611027&r2=1611028&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
Wed Jul 16 14:42:17 2014
@@ -392,7 +392,8 @@ public class AuthManager extends ConfigT
                 log.debug(username + " > D="+domain+" R="+realm + " M="+auth.getMechanism());
             }
             if (Mechanism.KERBEROS.equals(auth.getMechanism())) {
-                ((AbstractHttpClient) client).getAuthSchemes().register(AuthPolicy.SPNEGO,
new SPNegoSchemeFactory(true));
+                boolean stripPort = (url.getPort() == HTTPConstants.DEFAULT_HTTP_PORT ||
url.getPort() == HTTPConstants.DEFAULT_HTTPS_PORT);
+                ((AbstractHttpClient) client).getAuthSchemes().register(AuthPolicy.SPNEGO,
new SPNegoSchemeFactory(stripPort));
                 credentialsProvider.setCredentials(new AuthScope(null, -1, null), USE_JAAS_CREDENTIALS);
             } else {
                 credentialsProvider.setCredentials(

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1611028&r1=1611027&r2=1611028&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Wed Jul 16 14:42:17 2014
@@ -212,6 +212,7 @@ A workaround is to use a Java 7 update 4
 <h3>Timers, Assertions, Config, Pre- &amp; Post-Processors</h3>
 <ul>
 <li><bugzilla>56691</bugzilla> - Synchronizing Timer : Add timeout on waiting</li>
+<li><bugzilla>56701</bugzilla> - HTTP Authorization Manager/ Kerberos Authentication:
add port to SPN when server port is neither 80 nor 443</li>
 </ul>
 
 <h3>Functions</h3>



Mime
View raw message