Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse McConnell2012-08-16 18:10:35 -0400
committerJesse McConnell2012-08-16 18:10:35 -0400
commitc82871b10f1110b6e30e3aaa485b6955ce6e639c (patch)
tree9f9927cfa29a78b35b25908012ce79e15ad169f1 /jetty-security/src
parentea6a9f8b91dd278149cd3a2766f9570fb4690aaa (diff)
parent8dc7a7b1d70af2fee771f206d2999fa8fe04d68d (diff)
downloadorg.eclipse.jetty.project-c82871b10f1110b6e30e3aaa485b6955ce6e639c.tar.gz
org.eclipse.jetty.project-c82871b10f1110b6e30e3aaa485b6955ce6e639c.tar.xz
org.eclipse.jetty.project-c82871b10f1110b6e30e3aaa485b6955ce6e639c.zip
Merge branch 'master' into jetty-8
Diffstat (limited to 'jetty-security/src')
-rw-r--r--jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
index 17fbdc3f56..7acb1eff2d 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
@@ -188,8 +188,8 @@ public class FormAuthenticator extends LoginAuthenticator
if (!mandatory)
return _deferred;
- if (isLoginOrErrorPage(URIUtil.addPaths(request.getServletPath(),request.getPathInfo())))
- return Authentication.NOT_CHECKED;
+ if (isLoginOrErrorPage(URIUtil.addPaths(request.getServletPath(),request.getPathInfo())) &&!DeferredAuthentication.isDeferred(response))
+ return _deferred;
HttpSession session = request.getSession(true);

Back to the top