Commit f30e71c

committed

Destroy file_handle in fpm_main

If it's not in the CG(open_files) list, we need to destroy the file handle ourselves. Co-authored-by: Jakub Zelenka <bukka@php.net> Closes GH-10707.

1 parent 06ae750 commit f30e71cCopy full SHA for f30e71c

File tree

-0

lines changed

-0

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ PHP NEWS`
`16`	`16`
`17`	`17`	`- FPM:`
`18`	`18`	`. Fixed bug GH-10611 (fpm_env_init_main leaks environ). (nielsdos)`
	`19`	`+ . Destroy file_handle in fpm_main. (Jakub Zelenka, nielsdos)`
`19`	`20`
`20`	`21`	`- FTP:`
`21`	`22`	`. Propagate success status of ftp_close(). (nielsdos)`

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1918,6 +1918,13 @@ consult the installation file that came with this distribution, or visit \n\`
`1918`	`1918`
`1919`	`1919`	`php_execute_script(&file_handle);`
`1920`	`1920`
	`1921`	`+ /* Without opcache, or the first time with opcache, the file handle will be placed`
	`1922`	`+ * in the CG(open_files) list by open_file_for_scanning(). Starting from the second`
	`1923`	`+ * request in opcache, the file handle won't be in the list and therefore won't be destroyed for us. */`
	`1924`	`+ if (!file_handle.in_list) {`
	`1925`	`+ zend_destroy_file_handle(&file_handle);`
	`1926`	`+ }`
	`1927`	`+`
`1921`	`1928`	`fastcgi_request_done:`
`1922`	`1929`	`if (EXPECTED(primary_script)) {`
`1923`	`1930`	`efree(primary_script);`

Comments

(0)