update jetty configuration setting for proper request encoding of pre…

…view
eclipse-birt · Dec 17, 2018 · 8a56c6d · 8a56c6d
1 parent 66e626f
commit 8a56c6d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/viewer/org.eclipse.birt.report.viewer/META-INF/MANIFEST.MF b/viewer/org.eclipse.birt.report.viewer/META-INF/MANIFEST.MF
@@ -18,7 +18,8 @@ Import-Package: javax.servlet;version="2.4.0",
  org.apache.commons.logging,
  org.eclipse.equinox.http.jetty,
  org.osgi.service.http;version="1.2.0"
-Export-Package: org.eclipse.birt.report.viewer,
+Export-Package: org.eclipse.birt.report.filter,
+ org.eclipse.birt.report.viewer,
  org.eclipse.birt.report.viewer.api,
  org.eclipse.birt.report.viewer.browsers,
  org.eclipse.birt.report.viewer.browsers.custom,

diff --git a/....birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/filter/ViewerFilter.java b/....birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/filter/ViewerFilter.java
@@ -29,7 +29,7 @@ public class ViewerFilter implements Filter
 {
 
 	// default encoding
-	protected String encoding = "UTF-8"; //$NON-NLS-1$
+	protected String encoding = "ISO-8859-1"; //$NON-NLS-1$
 
 	// filter config
 	protected FilterConfig filterConfig = null;
@@ -64,7 +64,9 @@ public void doFilter( ServletRequest request, ServletResponse response,
 	{
 		if ( request.getCharacterEncoding( ) == null && encoding != null )
 			request.setCharacterEncoding( encoding );
-
+		// for >= 9.3.x jetty needs this property to change request encoding,
+		// this might change for future versions
+		request.setAttribute("org.eclipse.jetty.server.Request.queryEncoding", encoding);
 		chain.doFilter( request, response );
 	}