php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2'

Browse Source
This commit is contained in:
Jakub Zelenka
2023-05-14 12:29:19 +01:00
parent a225f6ab6b 1129046482
commit 03f64b7853
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1909,20 +1909,17 @@ consult the installation file that came with this distribution, or visit \n\
}
} zend_catch {
} zend_end_try();
/* we want to serve more requests if this is fastcgi
* so cleanup and continue, request shutdown is
* handled later */
/* We want to serve more requests if this is fastcgi so cleanup and continue,
* request shutdown is handled later. */
} else {
fpm_request_executing();
goto fastcgi_request_done;
/* Reset exit status from the previous execution */
EG(exit_status) = 0;
php_execute_script(&file_handle);
}
fpm_request_executing();
/* Reset exit status from the previous execution */
EG(exit_status) = 0;
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. */