Author: markt
Date: Wed Jul 10 13:40:32 2013
New Revision: 1501765
URL: http://svn.apache.org/r1501765
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55231
JSP capability should be based on effective version of webapp.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java?rev=1501765&r1=1501764&r2=1501765&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspConfig.java Wed Jul 10
13:40:32 2013
@@ -62,16 +62,16 @@ public class JspConfig {
private void processWebDotXml() {
// Very, very unlikely but just in case...
- if (ctxt.getMajorVersion() < 2) {
+ if (ctxt.getEffectiveMajorVersion() < 2) {
defaultIsELIgnored = "true";
defaultDeferedSyntaxAllowedAsLiteral = "true";
return;
}
- if (ctxt.getMajorVersion() == 2) {
- if (ctxt.getMinorVersion() < 5) {
+ if (ctxt.getEffectiveMajorVersion() == 2) {
+ if (ctxt.getEffectiveMinorVersion() < 5) {
defaultDeferedSyntaxAllowedAsLiteral = "true";
}
- if (ctxt.getMinorVersion() < 4) {
+ if (ctxt.getEffectiveMinorVersion() < 4) {
defaultIsELIgnored = "true";
return;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
