Author: markt
Date: Thu Sep 19 14:53:59 2013
New Revision: 1524763
URL: http://svn.apache.org/r1524763
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55570
Correct log exceptions so they appear in the logs
Added:
tomcat/tc7.0.x/trunk/conf/Tomcat/
tomcat/tc7.0.x/trunk/conf/Tomcat/localhost/
tomcat/tc7.0.x/trunk/embed-webapps/
tomcat/tc7.0.x/trunk/embed-webapps/examples.war (with props)
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1524761
Added: tomcat/tc7.0.x/trunk/embed-webapps/examples.war
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/embed-webapps/examples.war?rev=1524763&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tomcat/tc7.0.x/trunk/embed-webapps/examples.war
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java?rev=1524763&r1=1524762&r2=1524763&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
Thu Sep 19 14:53:59 2013
@@ -251,14 +251,13 @@ public class SpnegoAuthenticator extends
isStoreDelegatedCredential());
} catch (GSSException e) {
if (log.isDebugEnabled()) {
-
log.debug(sm.getString("spnegoAuthenticator.ticketValidateFail",
- e));
+
log.debug(sm.getString("spnegoAuthenticator.ticketValidateFail"), e);
}
response.setHeader("WWW-Authenticate", "Negotiate");
response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
return false;
} catch (PrivilegedActionException e) {
- log.error(sm.getString("spnegoAuthenticator.serviceLoginFail", e));
+ log.error(sm.getString("spnegoAuthenticator.serviceLoginFail"), e);
response.setHeader("WWW-Authenticate", "Negotiate");
response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
return false;
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1524763&r1=1524762&r2=1524763&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Sep 19 14:53:59 2013
@@ -55,7 +55,7 @@
They eventually become mixed with the numbered issues. (I.e., numbered
issues to not "pop up" wrt. others).
-->
-<section name="Tomcat 7.0.43 (markt)">
+<section name="Tomcat 7.0.43 (voiletagg)">
<subsection name="Catalina">
<changelog>
<add>
@@ -175,6 +175,10 @@
<code>org.apache.juli.ClassLoaderLogManager.debug=true</code>
is set.
</add>
+ <fix>
+ <bug>55570</bug>: Correctly log exceptions for all error conditions in
+ the SPNEGO authenticator. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
