Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2012-11-01 23:08:05 -0400
committerGreg Wilkins2012-11-01 23:08:05 -0400
commit52464a5ba63257cc6b91929ff24744d2ae880a11 (patch)
tree92d64435b65d5047ed7d4c065421aaa8be87c09c /jetty-security/src
parent2ab0ef25bdaed215b735247be365a64977fcfcf3 (diff)
parent5ad2161259b2d098f39f5176e348a84106cf43c8 (diff)
downloadorg.eclipse.jetty.project-52464a5ba63257cc6b91929ff24744d2ae880a11.tar.gz
org.eclipse.jetty.project-52464a5ba63257cc6b91929ff24744d2ae880a11.tar.xz
org.eclipse.jetty.project-52464a5ba63257cc6b91929ff24744d2ae880a11.zip
Merge remote-tracking branch 'origin/jetty-8'
Conflicts: jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java jetty-client/src/test/java/org/eclipse/jetty/client/SslHttpExchangeTest.java jetty-client/src/test/java/org/eclipse/jetty/client/SslSecurityListenerTest.java jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ProxyRule.java jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java jetty-start/src/main/java/org/eclipse/jetty/start/Main.java jetty-util/src/main/java/org/eclipse/jetty/util/Fields.java jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClientFactory.java jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionRFC6455.java jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java test-jetty-nested/src/main/java/org/eclipse/jetty/nested/Dump.java test-jetty-webapp/src/main/java/com/acme/Dump.java
Diffstat (limited to 'jetty-security/src')
-rw-r--r--jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java7
1 files changed, 4 insertions, 3 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 6ee6bb4e70..c08e97c7b8 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
@@ -21,6 +21,7 @@ package org.eclipse.jetty.security.authentication;
import java.io.IOException;
import java.util.Collections;
import java.util.Enumeration;
+import java.util.Locale;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
@@ -413,7 +414,7 @@ public class FormAuthenticator extends LoginAuthenticator
@Override
public long getDateHeader(String name)
{
- if (name.toLowerCase().startsWith("if-"))
+ if (name.toLowerCase(Locale.ENGLISH).startsWith("if-"))
return -1;
return super.getDateHeader(name);
}
@@ -421,7 +422,7 @@ public class FormAuthenticator extends LoginAuthenticator
@Override
public String getHeader(String name)
{
- if (name.toLowerCase().startsWith("if-"))
+ if (name.toLowerCase(Locale.ENGLISH).startsWith("if-"))
return null;
return super.getHeader(name);
}
@@ -435,7 +436,7 @@ public class FormAuthenticator extends LoginAuthenticator
@Override
public Enumeration<String> getHeaders(String name)
{
- if (name.toLowerCase().startsWith("if-"))
+ if (name.toLowerCase(Locale.ENGLISH).startsWith("if-"))
return Collections.<String>enumeration(Collections.<String>emptyList());
return super.getHeaders(name);
}

Back to the top