From c41f7e25f47ab352130d971fbbc88f6af6e89aae Mon Sep 17 00:00:00 2001
From: Tom Chiverton <tomchiverton@users.noreply.github.com>
Date: Tue, 2 Apr 2024 10:57:05 +0100
Subject: [PATCH 1/4] Add suppressTaffyHeaders settings

---
 core/api.cfc | 69 ++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 48 insertions(+), 21 deletions(-)

diff --git a/core/api.cfc b/core/api.cfc
index 81aaeb1..45b7bec 100644
--- a/core/api.cfc
+++ b/core/api.cfc
@@ -64,7 +64,9 @@
 		<cfset var after = 0 />
 		<cfset setupFramework() />
 		<cfset after = getTickCount() />
-		<cfheader name="X-TIME-TO-RELOAD" value="#(after-before)#" />
+		<cfif not application._taffy.settings.suppressTaffyHeaders >
+			<cfheader name="X-TIME-TO-RELOAD" value="#(after-before)#" />
+		</cfif>
 		<cfreturn true />
 	</cffunction>
 
@@ -430,19 +432,21 @@
 		<cfheader name="ALLOW" value="#local.allowVerbs#" />
 
 		<!--- metrics headers that should always apply --->
-		<cfheader name="X-TIME-IN-PARSE" value="#m.parseTime#" />
-		<cfheader name="X-TIME-IN-ONTAFFYREQUEST" value="#m.otrTime#" />
-		<cfif structKeyExists(m, "resourceTime")>
-			<cfheader name="X-TIME-IN-RESOURCE" value="#m.resourceTime#" />
-		</cfif>
-		<cfif structKeyExists(m, "cacheCheckTime")>
-			<cfheader name="X-TIME-IN-CACHE-CHECK" value="#m.cacheCheckTime#" />
-		</cfif>
-		<cfif structKeyExists(m, "cacheGetTime")>
-			<cfheader name="X-TIME-IN-CACHE-GET" value="#m.cacheGetTime#" />
-		</cfif>
-		<cfif structKeyExists(m, "cacheSaveTime")>
-			<cfheader name="X-TIME-IN-CACHE-SAVE" value="#m.cacheSaveTime#" />
+		<cfif not application._taffy.settings.suppressTaffyHeaders >
+			<cfheader name="X-TIME-IN-PARSE" value="#m.parseTime#" />
+			<cfheader name="X-TIME-IN-ONTAFFYREQUEST" value="#m.otrTime#" />
+			<cfif structKeyExists(m, "resourceTime")>
+				<cfheader name="X-TIME-IN-RESOURCE" value="#m.resourceTime#" />
+			</cfif>
+			<cfif structKeyExists(m, "cacheCheckTime")>
+				<cfheader name="X-TIME-IN-CACHE-CHECK" value="#m.cacheCheckTime#" />
+			</cfif>
+			<cfif structKeyExists(m, "cacheGetTime")>
+				<cfheader name="X-TIME-IN-CACHE-GET" value="#m.cacheGetTime#" />
+			</cfif>
+			<cfif structKeyExists(m, "cacheSaveTime")>
+				<cfheader name="X-TIME-IN-CACHE-SAVE" value="#m.cacheSaveTime#" />
+			</cfif>
 		</cfif>
 
 		<cfif application._taffy.settings.exposeHeaders>
@@ -477,7 +481,10 @@
 				/>
 				<cfset _taffyRequest.metrics.afterSerialize = getTickCount() />
 				<cfset m.serializeTime = m.afterSerialize - m.beforeSerialize />
-				<cfheader name="X-TIME-IN-SERIALIZE" value="#m.serializeTime#" />
+
+				<cfif not application._taffy.settings.suppressTaffyHeaders >
+					<cfheader name="X-TIME-IN-SERIALIZE" value="#m.serializeTime#" />
+				</cfif>
 
 				<!--- apply jsonp wrapper if requested --->
 				<cfif structKeyExists(_taffyRequest, "jsonpCallback")>
@@ -513,7 +520,10 @@
 				<cfif structKeyExists(m, "resourceTime")>
 					<cfset m.taffyTime -= m.resourceTime />
 				</cfif>
-				<cfheader name="X-TIME-IN-TAFFY" value="#m.taffyTime#" />
+
+				<cfif not application._taffy.settings.suppressTaffyHeaders >
+					<cfheader name="X-TIME-IN-TAFFY" value="#m.taffyTime#" />
+				</cfif>
 
 				<cfcontent reset="true" type="#application._taffy.settings.mimeExtensions[_taffyRequest.returnMimeExt]#; charset=utf-8" />
 				<cfif _taffyRequest.resultSerialized neq ('"' & '"')>
@@ -527,19 +537,32 @@
 			<cfelseif _taffyRequest.resultType eq "filename">
 				<cfset m.done = getTickCount() />
 				<cfset m.taffyTime = m.done - m.init - m.parseTime - m.otrTime - m.resourceTime />
-				<cfheader name="X-TIME-IN-TAFFY" value="#m.taffyTime#" />
+
+				<cfif not application._taffy.settings.suppressTaffyHeaders >
+					<cfheader name="X-TIME-IN-TAFFY" value="#m.taffyTime#" />
+				</cfif>
+
 				<cfcontent reset="true" file="#_taffyRequest.result.getFileName()#" type="#_taffyRequest.result.getFileMime()#" deletefile="#_taffyRequest.result.getDeleteFile()#" />
 
 			<cfelseif _taffyRequest.resultType eq "filedata">
 				<cfset m.done = getTickCount() />
 				<cfset m.taffyTime = m.done - m.init - m.parseTime - m.otrTime - m.resourceTime />
-				<cfheader name="X-TIME-IN-TAFFY" value="#m.taffyTime#" />
+
+
+				<cfif not application._taffy.settings.suppressTaffyHeaders >
+					<cfheader name="X-TIME-IN-TAFFY" value="#m.taffyTime#" />
+				</cfif>
+
 				<cfcontent reset="true" variable="#_taffyRequest.result.getFileData()#" type="#_taffyRequest.result.getFileMime()#" />
 
 			<cfelseif _taffyRequest.resultType eq "imagedata">
 				<cfset m.done = getTickCount() />
 				<cfset m.taffyTime = m.done - m.init - m.parseTime - m.otrTime - m.resourceTime />
-				<cfheader name="X-TIME-IN-TAFFY" value="#m.taffyTime#" />
+				
+				<cfif not application._taffy.settings.suppressTaffyHeaders >
+					<cfheader name="X-TIME-IN-TAFFY" value="#m.taffyTime#" />
+				</cfif>
+				
 				<cfcontent reset="true" variable="#_taffyRequest.result.getImageData()#" type="#_taffyRequest.result.getFileMime()#" />
 
 			</cfif>
@@ -570,7 +593,10 @@
 			,_taffyRequest.statusArgs.statusCode
 			) />
 		<cfset m.otreTime = getTickCount() - m.beforeOnTaffyRequestEnd />
-		<cfheader name="X-TIME-IN-ONTAFFYREQUESTEND" value="#m.otreTime#" />
+
+		<cfif not application._taffy.settings.suppressTaffyHeaders >
+			<cfheader name="X-TIME-IN-ONTAFFYREQUESTEND" value="#m.otreTime#" />
+		</cfif>
 
 		<cfif len(trim(local.resultSerialized))>
 			<cfoutput>#local.resultSerialized#</cfoutput>
@@ -606,6 +632,7 @@
 		<cfset local.defaultConfig.reloadKey = "reload" />
 		<cfset local.defaultConfig.reloadPassword = "true" />
 		<cfset local.defaultConfig.reloadOnEveryRequest = false />
+		<cfset local.defaultConfig.suppressTaffyHeaders = false />
 		<cfset local.defaultConfig.simulateKey = "sampleResponse" />
 		<cfset local.defaultConfig.simulatePassword = "true" />
 		<cfset local.defaultConfig.endpointURLParam = 'endpoint' />
@@ -1012,7 +1039,7 @@
 		<cfset local.numTokenNames = arrayLen(arguments.tokenNamesArray) />
 		<cfif local.numTokenNames gt 0>
 			<cfloop from="1" to="#local.numTokenNames#" index="local.t">
-				<cfset local.returnData[arguments.tokenNamesArray[local.t]] = urlDecode(local.tokenValues[local.t]) />
+				<cfset local.returnData[arguments.tokenNamesArray[local.t]] = local.tokenValues[local.t] />
 			</cfloop>
 		</cfif>
 		<!--- query_string input is also key-value pairs --->

From 7e266bed68ef20eff2ddacf345732974c17a01c8 Mon Sep 17 00:00:00 2001
From: Tom Chiverton <tchiverton@extravision.com>
Date: Tue, 2 Apr 2024 10:59:07 +0100
Subject: [PATCH 2/4] Revert; upstream change

---
 core/api.cfc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/api.cfc b/core/api.cfc
index 45b7bec..31b2e0f 100644
--- a/core/api.cfc
+++ b/core/api.cfc
@@ -1039,7 +1039,7 @@
 		<cfset local.numTokenNames = arrayLen(arguments.tokenNamesArray) />
 		<cfif local.numTokenNames gt 0>
 			<cfloop from="1" to="#local.numTokenNames#" index="local.t">
-				<cfset local.returnData[arguments.tokenNamesArray[local.t]] = local.tokenValues[local.t] />
+				<cfset local.returnData[arguments.tokenNamesArray[local.t]] = urlDecode(local.tokenValues[local.t]) />
 			</cfloop>
 		</cfif>
 		<!--- query_string input is also key-value pairs --->

From 7d55e21186df90b0cf10585251e5631b2d9aefe2 Mon Sep 17 00:00:00 2001
From: Tom Chiverton <tchiverton@extravision.com>
Date: Tue, 2 Apr 2024 11:24:21 +0100
Subject: [PATCH 3/4] Suppress this too, as appears on normal start up

---
 core/api.cfc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/api.cfc b/core/api.cfc
index 31b2e0f..3097f6d 100644
--- a/core/api.cfc
+++ b/core/api.cfc
@@ -616,7 +616,11 @@
 	<cffunction name="setupFramework" access="private" output="false" returntype="void">
 		<cfset var local = structNew() />
 		<cfparam name="variables.framework" default="#structNew()#" />
-		<cfheader name="X-TAFFY-RELOADED" value="true" />
+
+		<cfif not application._taffy.settings.suppressTaffyHeaders >
+			<cfheader name="X-TAFFY-RELOADED" value="true" />
+		</cfif>
+		
 		<cfset request.taffyReloaded = true />
 		<cfset local._taffy = structNew() />
 		<cfset local._taffy.version = "3.6.0" />

From 17821c73db1f03c0457b23b11397bc8108373026 Mon Sep 17 00:00:00 2001
From: Tom Chiverton <tchiverton@extravision.com>
Date: Tue, 2 Apr 2024 11:33:18 +0100
Subject: [PATCH 4/4] move this later so can see the setting

---
 core/api.cfc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/api.cfc b/core/api.cfc
index 3097f6d..0168242 100644
--- a/core/api.cfc
+++ b/core/api.cfc
@@ -616,10 +616,6 @@
 	<cffunction name="setupFramework" access="private" output="false" returntype="void">
 		<cfset var local = structNew() />
 		<cfparam name="variables.framework" default="#structNew()#" />
-
-		<cfif not application._taffy.settings.suppressTaffyHeaders >
-			<cfheader name="X-TAFFY-RELOADED" value="true" />
-		</cfif>
 		
 		<cfset request.taffyReloaded = true />
 		<cfset local._taffy = structNew() />
@@ -731,6 +727,10 @@
 		<cfset local._taffy.contentTypes = getSupportedContentTypes(local._taffy.settings.deserializer) />
 		<!--- hot-swap! --->
 		<cfset application._taffy = local._taffy />
+
+		<cfif not application._taffy.settings.suppressTaffyHeaders >
+			<cfheader name="X-TAFFY-RELOADED" value="true" />
+		</cfif>
 	</cffunction>
 
 	<cffunction name="parseRequest" access="private" output="false" returnType="struct">