Skip to content

Commit 03f64b7

Browse files
committed
Merge branch 'PHP-8.2'
2 parents a225f6a + 1129046 commit 03f64b7

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

sapi/fpm/fpm/fpm_main.c

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1909,19 +1909,16 @@ consult the installation file that came with this distribution, or visit \n\
19091909
}
19101910
} zend_catch {
19111911
} zend_end_try();
1912-
/* we want to serve more requests if this is fastcgi
1913-
* so cleanup and continue, request shutdown is
1914-
* handled later */
1915-
1916-
goto fastcgi_request_done;
1917-
}
1918-
1919-
fpm_request_executing();
1912+
/* We want to serve more requests if this is fastcgi so cleanup and continue,
1913+
* request shutdown is handled later. */
1914+
} else {
1915+
fpm_request_executing();
19201916

1921-
/* Reset exit status from the previous execution */
1922-
EG(exit_status) = 0;
1917+
/* Reset exit status from the previous execution */
1918+
EG(exit_status) = 0;
19231919

1924-
php_execute_script(&file_handle);
1920+
php_execute_script(&file_handle);
1921+
}
19251922

19261923
/* Without opcache, or the first time with opcache, the file handle will be placed
19271924
* in the CG(open_files) list by open_file_for_scanning(). Starting from the second

0 commit comments

Comments
 (0)