archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix #78919: CLI server: insufficient cleanup if request startup fails

Browse source 
We need to run the full `php_cli_server_request_shutdown()` in case of
failing `php_cli_server_request_startup()`.

Patch contributed by @cataphract.

Closes GH-7322.
This commit is contained in:
Christoph M. Becker 2021-07-30 15:36:12 +02:00
parent ef5558a8cd
commit be2df43b08
No known key found for this signature in database
GPG key ID: D66C9593118BCCB6
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -9,6 +9,8 @@ PHP NEWS
(krakjoe) (krakjoe)
. Fixed bug #81192 ("Declaration should be compatible with" gives incorrect . Fixed bug #81192 ("Declaration should be compatible with" gives incorrect
line number with traits). (Nikita) line number with traits). (Nikita)
. Fixed bug #78919 (CLI server: insufficient cleanup if request startup
fails). (cataphract, cmb)
- Date: - Date:
. Fixed bug #79580 (date_create_from_format misses leap year). (Derick) . Fixed bug #79580 (date_create_from_format misses leap year). (Derick)

6
sapi/cli/php_cli_server.c
View file

@ -2126,8 +2126,6 @@ static int php_cli_server_request_startup(php_cli_server *server, php_cli_server
} }
SG(sapi_headers).http_response_code = 200; SG(sapi_headers).http_response_code = 200;
if (FAILURE == php_request_startup()) { if (FAILURE == php_request_startup()) {
/* should never be happen */
destroy_request_info(&SG(request_info));
return FAILURE; return FAILURE;
} }
PG(during_request_startup) = 0; PG(during_request_startup) = 0;
@ -2198,9 +2196,7 @@ static int php_cli_server_dispatch(php_cli_server *server, php_cli_server_client
if (server->router || !is_static_file) { if (server->router || !is_static_file) {
if (FAILURE == php_cli_server_request_startup(server, client)) { if (FAILURE == php_cli_server_request_startup(server, client)) {
SG(server_context) = NULL; php_cli_server_request_shutdown(server, client);
php_cli_server_close_connection(server, client);
destroy_request_info(&SG(request_info));
return SUCCESS; return SUCCESS;
} }
} }