clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 09:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.1' into PHP-8.2

Browse Source 
* PHP-8.1:
  Destroy file_handle in fpm_main
This commit is contained in:
Niels Dossche 2023-03-18 21:00:21 +01:00
commit e44b1a916d
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -24,6 +24,7 @@ PHP NEWS
- FPM:
. Fixed bug GH-10611 (fpm_env_init_main leaks environ). (nielsdos)
. Destroy file_handle in fpm_main. (Jakub Zelenka, nielsdos)
- FTP:
. Propagate success status of ftp_close(). (nielsdos)

7
sapi/fpm/fpm/fpm_main.c
View File

@ -1903,6 +1903,13 @@ consult the installation file that came with this distribution, or visit \n\
php_execute_script(&file_handle);
/* Without opcache, or the first time with opcache, the file handle will be placed
* in the CG(open_files) list by open_file_for_scanning(). Starting from the second
* request in opcache, the file handle won't be in the list and therefore won't be destroyed for us. */
if (!file_handle.in_list) {
zend_destroy_file_handle(&file_handle);
}
fastcgi_request_done:
if (EXPECTED(primary_script)) {
efree(primary_script);