add support for jakarta / tomcat10, otherwise only the homepage html is return

zspitzer · zspitzer · commit 269ce431eee3 · 2025-02-27T10:09:27.000+01:00
needed to pick up the urlrewrite infos
diff --git a/server/Application.cfc b/server/Application.cfc
@@ -313,7 +313,11 @@ component {
 	}
 
 	private string function _getRequestUri() {
-		return request[ "javax.servlet.forward.request_uri" ] ?: "/";
+		if ( structKeyExists( request, "jakarta.servlet.forward.request_uri" ) )
+			return request[ "jakarta.servlet.forward.request_uri" ] ?: "/";
+		else if ( structKeyExists( request, "javax.servlet.forward.request_uri" ) )
+			return request[ "java.servlet.forward.request_uri" ] ?: "/";
+		return "/";
 	}
 
 	private void function _404(required string path, required string baseHref) {

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,11 @@ component {`
`313`	`313`	`}`
`314`	`314`
`315`	`315`	`private string function _getRequestUri() {`
`316`		`- return request[ "javax.servlet.forward.request_uri" ] ?: "/";`
	`316`	`+ if ( structKeyExists( request, "jakarta.servlet.forward.request_uri" ) )`
	`317`	`+ return request[ "jakarta.servlet.forward.request_uri" ] ?: "/";`
	`318`	`+ else if ( structKeyExists( request, "javax.servlet.forward.request_uri" ) )`
	`319`	`+ return request[ "java.servlet.forward.request_uri" ] ?: "/";`
	`320`	`+ return "/";`
`317`	`321`	`}`
`318`	`322`
`319`	`323`	`private void function _404(required string path, required string baseHref) {`