Fixed occasional proc_close() PHP CGI hang issue.

cubiclesoft · cubiclesoft · commit 25e1818db88b · 2022-02-26T10:44:42.000-07:00
diff --git a/server.php b/server.php
@@ -1,6 +1,6 @@
 <?php
 	// PHP App Server.
-	// (C) 2021 CubicleSoft.  All Rights Reserved.
+	// (C) 2019 CubicleSoft.  All Rights Reserved.
 
 	if (!isset($_SERVER["argc"]) || !$_SERVER["argc"])
 	{
@@ -225,6 +225,7 @@ protected function HandleResponseCompleted($id, $result)
 			{
 				foreach ($client->appdata["cgi"]["pipes"] as $fp)  fclose($fp);
 
+				proc_terminate($client->appdata["cgi"]["proc"]);
 				proc_close($client->appdata["cgi"]["proc"]);
 
 				if (trim($client->appdata["cgi"]["stderr"]) !== "")

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`	`// PHP App Server.`
`3`		`- // (C) 2021 CubicleSoft. All Rights Reserved.`
	`3`	`+ // (C) 2019 CubicleSoft. All Rights Reserved.`
`4`	`4`
`5`	`5`	`if (!isset($_SERVER["argc"]) \|\| !$_SERVER["argc"])`
`6`	`6`	`{`
`@@ -225,6 +225,7 @@ protected function HandleResponseCompleted($id, $result)`
`225`	`225`	`{`
`226`	`226`	`foreach ($client->appdata["cgi"]["pipes"] as $fp) fclose($fp);`
`227`	`227`
	`228`	`+ proc_terminate($client->appdata["cgi"]["proc"]);`
`228`	`229`	`proc_close($client->appdata["cgi"]["proc"]);`
`229`	`230`
`230`	`231`	`if (trim($client->appdata["cgi"]["stderr"]) !== "")`