fix: properly close context on worker script timeouts and crashes (#1184

) * Properly closes context on script timeouts and crashes. * trigger pipeline --------- Co-authored-by: Alliballibaba <[email protected]>
dunglas · Nov 23, 2024 · ccf2af7 · ccf2af7
1 parent 6d123c7
commit ccf2af7
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/frankenphp.go b/frankenphp.go
@@ -536,6 +536,13 @@ func go_handle_request(threadIndex C.uintptr_t) bool {
 			panic(ScriptExecutionError)
 		}
 
+		// if the script has errored or timed out, make sure any pending worker requests are closed
+		if fc.exitStatus > 0 && thread.workerRequest != nil {
+			fc := thread.workerRequest.Context().Value(contextKey).(*FrankenPHPContext)
+			maybeCloseContext(fc)
+			thread.workerRequest = nil
+		}
+
 		return true
 	}
 }