limit cookie parsing and add additional env var alias for limit evalu…

…ation
lucee · Jan 29, 2024 · bd3d2d2 · bd3d2d2
1 parent a1bca25
commit bd3d2d2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java b/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java
@@ -4092,8 +4092,10 @@ private static void _loadScope(ConfigServerImpl configServer, ConfigImpl config,
 				config.setLimitEvaluation(true);
 			}
 			else {
-				Boolean limitEvaluation = Caster.toBoolean(SystemUtil.getSystemPropOrEnvVar("lucee.isdefined.limit", null), null);
+				Boolean limitEvaluation = Caster.toBoolean(SystemUtil.getSystemPropOrEnvVar("lucee.security.limitEvaluation", null), null);
 				if (limitEvaluation == null) limitEvaluation = Caster.toBoolean(SystemUtil.getSystemPropOrEnvVar("lucee.security.isdefined", null), null);
+				if (limitEvaluation == null) limitEvaluation = Caster.toBoolean(SystemUtil.getSystemPropOrEnvVar("lucee.isdefined.limit", null), null);
+
 				if (limitEvaluation == null) {
 					Struct security = ConfigWebUtil.getAsStruct("security", root);
 					if (security != null) {

diff --git a/core/src/main/java/lucee/runtime/type/scope/storage/StorageScopeCookie.java b/core/src/main/java/lucee/runtime/type/scope/storage/StorageScopeCookie.java
@@ -50,7 +50,7 @@ public abstract class StorageScopeCookie extends StorageScopeImpl {
 	private static final long serialVersionUID = -3509170569488448183L;
 
 	private static ScriptConverter serializer = new ScriptConverter();
-	protected static CFMLExpressionInterpreter evaluator = new CFMLExpressionInterpreter(false);
+	protected static CFMLExpressionInterpreter evaluator = new CFMLExpressionInterpreter(true);
 	// private Cookie cookie;
 	private String cookieName;
 

diff --git a/loader/build.xml b/loader/build.xml
@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="6.0.1.58-SNAPSHOT"/>
+  <property name="version" value="6.0.1.59-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

diff --git a/loader/pom.xml b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.0.1.58-SNAPSHOT</version>
+  <version>6.0.1.59-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>