Author: fmeschbe
Date: Thu Feb 20 08:20:36 2014
New Revision: 1570102
URL: http://svn.apache.org/r1570102
Log:
Update to changes to trunk after branching (prepare reintegration)
Modified:
sling/whiteboard/fmeschbe/parameters/engine/ (props changed)
sling/whiteboard/fmeschbe/parameters/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletResponseImpl.java
sling/whiteboard/fmeschbe/parameters/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java
Propchange: sling/whiteboard/fmeschbe/parameters/engine/
------------------------------------------------------------------------------
svn:mergeinfo = /sling/trunk/bundles/engine:1559659-1570101
Modified:
sling/whiteboard/fmeschbe/parameters/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletResponseImpl.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/fmeschbe/parameters/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletResponseImpl.java?rev=1570102&r1=1570101&r2=1570102&view=diff
==============================================================================
---
sling/whiteboard/fmeschbe/parameters/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletResponseImpl.java
(original)
+++
sling/whiteboard/fmeschbe/parameters/engine/src/main/java/org/apache/sling/engine/impl/SlingHttpServletResponseImpl.java
Thu Feb 20 08:20:36 2014
@@ -362,6 +362,6 @@ public class SlingHttpServletResponseImp
}
private String map(String url) {
- return getRequestData().getResourceResolver().map(url);
+ return
getRequestData().getResourceResolver().map(getRequestData().getServletRequest(),
url);
}
}
Modified:
sling/whiteboard/fmeschbe/parameters/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/fmeschbe/parameters/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java?rev=1570102&r1=1570101&r2=1570102&view=diff
==============================================================================
---
sling/whiteboard/fmeschbe/parameters/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java
(original)
+++
sling/whiteboard/fmeschbe/parameters/engine/src/main/java/org/apache/sling/engine/impl/parameters/ParameterSupport.java
Thu Feb 20 08:20:36 2014
@@ -57,11 +57,18 @@ public class ParameterSupport {
private static final String ATTR_NAME = ParameterSupport.class.getName();
/**
- * The name of the request attribute to set to get the Jetty servlet
- * container to decode the request query using ISO-8859-1 encoding (value
is
- * "org.mortbay.jetty.Request.queryEncoding").
+ * 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 =
"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";
@@ -156,8 +163,8 @@ public class ParameterSupport {
// 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,
- Util.ENCODING_DIRECT);
+ servletRequest.setAttribute(ATTR_JETTY_QUERY_ENCODING_1,
Util.ENCODING_DIRECT);
+ servletRequest.setAttribute(ATTR_JETTY_QUERY_ENCODING_2,
Util.ENCODING_DIRECT);
}
private HttpServletRequest getServletRequest() {
