Merge pull request #309 from tomchiverton/patch-3

atuttle · atuttle · commit 2e3e896050c3 · 2016-03-11T12:36:44.000-05:00
Stop Taffy intercepting requests in ignored folders when applicaton starting up
diff --git a/core/api.cfc b/core/api.cfc
@@ -83,7 +83,7 @@
 			(
 				application._taffy.settings.reloadOnEveryRequest eq true
 			)>
-			<cfif !local.reloadedInThisRequest><!--- prevent double reloads --->
+			<cfif !local.reloadedInThisRequest and !isUnhandledPathRequest(arguments.targetPath)><!--- prevent double reloads --->
 				<cfset onApplicationStart() />
 			</cfif>
 		</cfif>

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@`
`83`	`83`	`(`
`84`	`84`	`application._taffy.settings.reloadOnEveryRequest eq true`
`85`	`85`	`)>`
`86`		`- <cfif !local.reloadedInThisRequest><!--- prevent double reloads --->`
	`86`	`+ <cfif !local.reloadedInThisRequest and !isUnhandledPathRequest(arguments.targetPath)><!--- prevent double reloads --->`
`87`	`87`	`<cfset onApplicationStart() />`
`88`	`88`	`</cfif>`
`89`	`89`	`</cfif>`