diff -urN /var/tmp/portage/servletapi-2.4/work/jakarta-tomcat-5.0.19-src/jakarta-servletapi-5/jsr152/examples/jsp2/el/functions.jsp jakarta-servletapi-5/jsr152/examples/jsp2/el/functions.jsp --- /var/tmp/portage/servletapi-2.4/work/jakarta-tomcat-5.0.19-src/jakarta-servletapi-5/jsr152/examples/jsp2/el/functions.jsp 2004-02-14 11:26:44.000000000 +0100 +++ jakarta-servletapi-5/jsr152/examples/jsp2/el/functions.jsp 2005-02-04 15:32:05.474146784 +0100 @@ -1,3 +1,4 @@ +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="my" uri="http://jakarta.apache.org/tomcat/jsp2-example-taglib"%> @@ -15,7 +16,7 @@
Change Parameter
@@ -27,19 +28,19 @@\${param["foo"]} -${param["foo"]} +${fn:escapeXml(param["foo"])} \${my:reverse(param["foo"])} -${my:reverse(param["foo"])} +${my:reverse(fn:escapeXml(param["foo"]))} \${my:reverse(my:reverse(param["foo"]))} -${my:reverse(my:reverse(param["foo"]))} +${my:reverse(my:reverse(fn:escapeXml(param["foo"])))} diff -urN /var/tmp/portage/servletapi-2.4/work/jakarta-tomcat-5.0.19-src/jakarta-servletapi-5/jsr152/examples/jsp2/el/implicit-objects.jsp jakarta-servletapi-5/jsr152/examples/jsp2/el/implicit-objects.jsp --- /var/tmp/portage/servletapi-2.4/work/jakarta-tomcat-5.0.19-src/jakarta-servletapi-5/jsr152/examples/jsp2/el/implicit-objects.jsp 2004-02-14 11:26:44.000000000 +0100 +++ jakarta-servletapi-5/jsr152/examples/jsp2/el/implicit-objects.jsp 2005-02-04 15:32:14.639753400 +0100 @@ -1,3 +1,4 @@ +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> \${my:countVowels(param["foo"])} -${my:countVowels(param["foo"])} +${my:countVowels(fn:escapeXml(param["foo"]))} JSP 2.0 Expression Language - Implicit Objects @@ -34,7 +35,7 @@Change Parameter
@@ -46,11 +47,11 @@\${param.foo} -${param.foo} +fn:escapeXml(${param.foo}) \${param["foo"]} -${param["foo"]} +fn:escapeXml(${param["foo"])} \${header["host"]} diff -urN /var/tmp/portage/servletapi-2.4/work/jakarta-tomcat-5.0.19-src/jakarta-servletapi-5/jsr152/examples/jsp2/jspx/textRotate.jspx jakarta-servletapi-5/jsr152/examples/jsp2/jspx/textRotate.jspx --- /var/tmp/portage/servletapi-2.4/work/jakarta-tomcat-5.0.19-src/jakarta-servletapi-5/jsr152/examples/jsp2/jspx/textRotate.jspx 2004-02-14 11:26:44.000000000 +0100 +++ jakarta-servletapi-5/jsr152/examples/jsp2/jspx/textRotate.jspx 2005-02-04 15:34:24.910949168 +0100 @@ -6,11 +6,12 @@