LDEV-4805 Added flush attribute to cfdump

MitrahSoft · Mar 24, 2024 · 6569771 · 6569771
1 parent 9d12a1d
commit 6569771
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -15,8 +15,8 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
   </properties>
 
   <licenses>

diff --git a/core/src/main/java/resource/library/tag/Dump.cfc b/core/src/main/java/resource/library/tag/Dump.cfc
@@ -38,7 +38,8 @@ component {
 		"abort": {required:false, type:"boolean",default:false,hint="stops further processing of request."},
 		"contextlevel": {required:false, type:"number",default:2,hidden:true},
 		"async": {required:false, type="boolean", default=false, hint="if true and output is not to browser, Lucee builds the output in a new thread that runs in parallel to the thread that called the dump.  please note that if the calling thread modifies the data before the dump takes place, it is possible that the dump will show the modified data."},
-		"enabled": { required: false, type: "boolean", default: true, hint: "dumps are enabled by default, pass false to short circuit a dump execution and effectively disable it" }
+		"enabled": { required: false, type: "boolean", default: true, hint: "dumps are enabled by default, pass false to short circuit a dump execution and effectively disable it" },
+		"flush": { required: false, type: "boolean", default: false, hint: "flushes the response stream after the dump" },
 	];
 
 
@@ -124,6 +125,9 @@ component {
 		if (attrib.abort)
 			abort;
 
+		if (attrib.flush)
+			flush throwOnError=false;
+
 		return true;
 	}
 

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.2.2-SNAPSHOT"/>
+  <property name="version" value="6.0.2.3-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.2.2-SNAPSHOT</version>
+  <version>6.0.2.3-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>

diff --git a/loader/src/main/java/lucee/debug/Main.java b/loader/src/main/java/lucee/debug/Main.java
@@ -12,7 +12,7 @@ public class Main {
 	public static final String ARG_HOST = "LUCEE_DEBUG_HOST";
 	public static final String ARG_PORT = "LUCEE_DEBUG_PORT";
 	public static final String ARG_BASE = "LUCEE_DEBUG_BASE";
-	public static final String ARG_WEBXML = "LUCEE_DEBUG_BASE";
+	public static final String ARG_WEBXML = "LUCEE_DEBUG_WEBXML";
 
 	public static final String DEF_HOST = "localhost";
 	public static final String DEF_PORT = "48080";