more compats on engine detection

Ortus-Solutions · Apr 22, 2024 · 626ed7d · 626ed7d
1 parent ca202fe
commit 626ed7d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/system/BaseSpec.cfc b/system/BaseSpec.cfc
@@ -870,8 +870,10 @@ component {
 		string labels     = ""
 	) output=true{
 		setting requesttimeout=99999999;
+
 		// content type defaulted, to avoid dreaded wddx default
 		getPageContext().getResponse().setContentType( "text/html" );
+
 		// run tests
 		var runner = new testbox.system.TestBox(
 			bundles : "#getMetadata( this ).name#",

diff --git a/system/reports/BaseReporter.cfc b/system/reports/BaseReporter.cfc
@@ -17,10 +17,10 @@ component {
 	 * Helper method to deal with ACF2016's overload of the page context response, come on Adobe, get your act together!
 	 */
 	function getPageContextResponse(){
-		if ( structKeyExists( server, "lucee" ) ) {
-			return getPageContext().getResponse();
-		} else {
+		if( server.keyExists( "coldfusion" ) && server.coldfusion.productName.findNoCase( "ColdFusion") ){
 			return getPageContext().getResponse().getResponse();
+		} else {
+			return getPageContext().getResponse();
 		}
 	}
 

diff --git a/system/util/Util.cfc b/system/util/Util.cfc
@@ -108,10 +108,10 @@ component {
 	 * Check if you are in cfthread or not for any CFML Engine
 	 */
 	boolean function inThread(){
-		var engine = "ADOBE";
+		var engine = "LUCEE";
 
-		if ( server.coldfusion.productname eq "Lucee" ) {
-			engine = "LUCEE";
+		if ( server.keyExists( "coldfusion" ) && server.coldfusion.productname.findNoCase( "ColdFusion") ) {
+			engine = "ADOBE";
 		}
 
 		switch ( engine ) {