Commit e44b1a9

committed

Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1: Destroy file_handle in fpm_main

2 parents d479b5a + f30e71c commit e44b1a9Copy full SHA for e44b1a9

File tree

-0

lines changed

-0

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ PHP NEWS`
`24`	`24`
`25`	`25`	`- FPM:`
`26`	`26`	`. Fixed bug GH-10611 (fpm_env_init_main leaks environ). (nielsdos)`
	`27`	`+ . Destroy file_handle in fpm_main. (Jakub Zelenka, nielsdos)`
`27`	`28`
`28`	`29`	`- FTP:`
`29`	`30`	`. Propagate success status of ftp_close(). (nielsdos)`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1903,6 +1903,13 @@ consult the installation file that came with this distribution, or visit \n\`
`1903`	`1903`
`1904`	`1904`	`php_execute_script(&file_handle);`
`1905`	`1905`
	`1906`	`+ /* Without opcache, or the first time with opcache, the file handle will be placed`
	`1907`	`+ * in the CG(open_files) list by open_file_for_scanning(). Starting from the second`
	`1908`	`+ * request in opcache, the file handle won't be in the list and therefore won't be destroyed for us. */`
	`1909`	`+ if (!file_handle.in_list) {`
	`1910`	`+ zend_destroy_file_handle(&file_handle);`
	`1911`	`+ }`
	`1912`	`+`
`1906`	`1913`	`fastcgi_request_done:`
`1907`	`1914`	`if (EXPECTED(primary_script)) {`
`1908`	`1915`	`efree(primary_script);`

Comments

(0)