From 5dd4297851320d66bebeaedf376edad8a0637766 Mon Sep 17 00:00:00 2001
From: Tom Chiverton <tomchiverton@users.noreply.github.com>
Date: Mon, 2 Jun 2025 13:57:54 +0100
Subject: [PATCH 1/4] Work around for Cannot invoke
 "java.lang.Class.isPrimitive()"

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

diff --git a/core/api.cfc b/core/api.cfc
index 00e1c20..d52d209 100644
--- a/core/api.cfc
+++ b/core/api.cfc
@@ -726,7 +726,16 @@
 
 		<!--- Check for method tunnelling by clients unable to send PUT/DELETE requests (e.g. Flash Player);
 					Actual desired method will be contained in a special header --->
- 		<cfset var httpMethodOverride = GetPageContext().getRequest().getHeader("X-HTTP-Method-Override") />
+ 		 		<cfset var httpMethodOverride = nullValue()/>
+ 		<cftry>
+ 			<cfset httpMethodOverride = GetPageContext().getRequest().getHeader("X-HTTP-Method-Override") />
+ 			<cfcatch type="any"></cfcatch>
+ 		</cftry>
+<cfset var httpMethodOverride = nullValue()/>
+ 		<cftry>
+ 			<cfset httpMethodOverride = GetPageContext().getRequest().getHeader("X-HTTP-Method-Override") />
+ 			<cfcatch type="any"></cfcatch>
+ 		</cftry>
 
 		<cfset requestObj.uri = getPath() />
 		<cfif NOT len(requestObj.uri)>

From 00dbc65ddb002f2ba70258783d171bab2b7960ff Mon Sep 17 00:00:00 2001
From: Tom Chiverton <tomchiverton@users.noreply.github.com>
Date: Mon, 2 Jun 2025 17:52:31 +0100
Subject: [PATCH 2/4] Update api.cfc

---
 core/api.cfc | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/core/api.cfc b/core/api.cfc
index d52d209..c610fff 100644
--- a/core/api.cfc
+++ b/core/api.cfc
@@ -726,12 +726,7 @@
 
 		<!--- Check for method tunnelling by clients unable to send PUT/DELETE requests (e.g. Flash Player);
 					Actual desired method will be contained in a special header --->
- 		 		<cfset var httpMethodOverride = nullValue()/>
- 		<cftry>
- 			<cfset httpMethodOverride = GetPageContext().getRequest().getHeader("X-HTTP-Method-Override") />
- 			<cfcatch type="any"></cfcatch>
- 		</cftry>
-<cfset var httpMethodOverride = nullValue()/>
+ 		<cfset var httpMethodOverride = null />
  		<cftry>
  			<cfset httpMethodOverride = GetPageContext().getRequest().getHeader("X-HTTP-Method-Override") />
  			<cfcatch type="any"></cfcatch>

From 8444d8e523efe6e7d9ffbe3c0ea2e3eb45de8d49 Mon Sep 17 00:00:00 2001
From: Adam Tuttle <adam@alumniq.com>
Date: Mon, 2 Jun 2025 16:12:23 -0400
Subject: [PATCH 3/4] let's just use "null" for better old-version support

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

diff --git a/core/api.cfc b/core/api.cfc
index c610fff..67df44c 100644
--- a/core/api.cfc
+++ b/core/api.cfc
@@ -726,11 +726,11 @@
 
 		<!--- Check for method tunnelling by clients unable to send PUT/DELETE requests (e.g. Flash Player);
 					Actual desired method will be contained in a special header --->
- 		<cfset var httpMethodOverride = null />
- 		<cftry>
- 			<cfset httpMethodOverride = GetPageContext().getRequest().getHeader("X-HTTP-Method-Override") />
- 			<cfcatch type="any"></cfcatch>
- 		</cftry>
+		<cfset var httpMethodOverride = "null" />
+		<cftry>
+			<cfset httpMethodOverride = GetPageContext().getRequest().getHeader("X-HTTP-Method-Override") />
+			<cfcatch type="any"></cfcatch>
+		</cftry>
 
 		<cfset requestObj.uri = getPath() />
 		<cfif NOT len(requestObj.uri)>
@@ -742,8 +742,8 @@
 			</cfif>
 		</cfif>
 
- 		<!--- check for format in the URI --->
- 		<cfset requestObj.uriFormat = formatFromURI(requestObj.uri) />
+		<!--- check for format in the URI --->
+		<cfset requestObj.uriFormat = formatFromURI(requestObj.uri) />
 
 		<!--- attempt to find the cfc for the requested uri --->
 		<cfset requestObj.matchingRegex = matchURI(requestObj.uri) />
@@ -760,8 +760,8 @@
 		<cfset requestObj.verb = cgi.request_method />
 
 		<!--- Should we override the actual method based on method tunnelling? --->
-		<cfif isDefined("httpMethodOverride") AND not isNull(httpMethodOverride)>
-		    <cfset requestObj.verb = httpMethodOverride />
+		<cfif isDefined("httpMethodOverride") AND not httpMethodOverride eq "null">
+			<cfset requestObj.verb = httpMethodOverride />
 		</cfif>
 
 		<cfif structKeyExists(application._taffy.endpoints[requestObj.matchingRegex].methods, requestObj.verb)>

From 049d4814d70f6e234a366c66d0b602af8e13cb48 Mon Sep 17 00:00:00 2001
From: Adam Tuttle <adam@alumniq.com>
Date: Mon, 2 Jun 2025 16:13:49 -0400
Subject: [PATCH 4/4] need to keep the isNull check in case that's the result
 from the header

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

diff --git a/core/api.cfc b/core/api.cfc
index 67df44c..7051035 100644
--- a/core/api.cfc
+++ b/core/api.cfc
@@ -760,7 +760,7 @@
 		<cfset requestObj.verb = cgi.request_method />
 
 		<!--- Should we override the actual method based on method tunnelling? --->
-		<cfif isDefined("httpMethodOverride") AND not httpMethodOverride eq "null">
+		<cfif isDefined("httpMethodOverride") AND not isNull(httpMethodOverride) AND not httpMethodOverride eq "null">
 			<cfset requestObj.verb = httpMethodOverride />
 		</cfif>