This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push: new 6190e7a Update references to Java 6 6190e7a is described below commit 6190e7a8717bd75c1bcce7b956ef700334812ced Author: Mark Thomas <ma...@apache.org> AuthorDate: Wed Jul 28 21:27:34 2021 +0100 Update references to Java 6 --- java/org/apache/catalina/filters/RemoteIpFilter.java | 1 - webapps/docs/jasper-howto.xml | 16 ++++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/java/org/apache/catalina/filters/RemoteIpFilter.java b/java/org/apache/catalina/filters/RemoteIpFilter.java index e20faee..b674388 100644 --- a/java/org/apache/catalina/filters/RemoteIpFilter.java +++ b/java/org/apache/catalina/filters/RemoteIpFilter.java @@ -794,7 +794,6 @@ public class RemoteIpFilter extends GenericFilter { if (isInternal || (trustedProxies != null && trustedProxies.matcher(request.getRemoteAddr()).matches())) { String remoteIp = null; - // In java 6, proxiesHeaderValue should be declared as a java.util.Deque LinkedList<String> proxiesHeaderValue = new LinkedList<>(); StringBuilder concatRemoteIpHeaderValue = new StringBuilder(); diff --git a/webapps/docs/jasper-howto.xml b/webapps/docs/jasper-howto.xml index 0806be8..782a30a 100644 --- a/webapps/docs/jasper-howto.xml +++ b/webapps/docs/jasper-howto.xml @@ -448,10 +448,18 @@ are automatically compiled as part of the build process. At the jasper task you can use the option <code>addWebXmlMappings</code> for automatic merge the <code>${webapp.path}/WEB-INF/generated_web.xml</code> with the current web application deployment descriptor at -<code>${webapp.path}/WEB-INF/web.xml</code>. When you want to use Java 6 -features inside your JSP's, add the following javac compiler task attributes: -<code>source="1.6" target="1.6"</code>. For live -applications you can also disable debug info with <code>debug="off"</code>. +<code>${webapp.path}/WEB-INF/web.xml</code>. +</p> + +<p> +When you want to use a specific version of Java for your JSP's, add the +javac compiler task attributes <code>source</code> and <code>target</code> with +appropriate values. For example, <code>16</code> to compile JSPs for Java 16. +</p> + +<p> +For production you may wish to disable debug info with +<code>debug="off"</code>. </p> <p> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org