You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2014/02/24 16:19:02 UTC
svn commit: r1571315 -
/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java
Author: fmeschbe
Date: Mon Feb 24 15:19:01 2014
New Revision: 1571315
URL: http://svn.apache.org/r1571315
Log:
SLING-3403 Remove Jetty parameter encoding workaround
Modified:
sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java
Modified: sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java?rev=1571315&r1=1571314&r2=1571315&view=diff
==============================================================================
--- sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java (original)
+++ sling/trunk/bundles/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java Mon Feb 24 15:19:01 2014
@@ -58,20 +58,6 @@ public class ParameterSupport {
// used during the request
private static final String ATTR_NAME = ParameterSupport.class.getName();
- /**
- * The name of the request attribute to set to get the Jetty 6 (and older)
- * servlet container to decode the request query using ISO-8859-1 encoding
- * (value is "org.mortbay.jetty.Request.queryEncoding").
- */
- private static final String ATTR_JETTY_QUERY_ENCODING_1 = "org.mortbay.jetty.Request.queryEncoding";
-
- /**
- * The name of the request attribute to set to get the Jetty 7 (and newer)
- * servlet container to decode the request query using ISO-8859-1 encoding
- * (value is "org.eclipse.jetty.server.Request.queryEncoding").
- */
- private static final String ATTR_JETTY_QUERY_ENCODING_2 = "org.eclipse.jetty.server.Request.queryEncoding";
-
/** Content type signaling parameters in request body */
private static final String WWW_FORM_URL_ENC = "application/x-www-form-urlencoded";
@@ -164,13 +150,7 @@ public class ParameterSupport {
private ParameterSupport(HttpServletRequest servletRequest) {
this.servletRequest = servletRequest;
-
- // SLING-559: Hack to get Jetty into decoding the request
- // query with ISO-8859-1 as stipulated by the servlet
- // spec. Other containers ignore this parameter
- servletRequest.setAttribute(ATTR_JETTY_QUERY_ENCODING_1, Util.ENCODING_DIRECT);
- servletRequest.setAttribute(ATTR_JETTY_QUERY_ENCODING_2, Util.ENCODING_DIRECT);
- }
+ }
private HttpServletRequest getServletRequest() {
return servletRequest;