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

Merge branch 'PHP-8.0' into PHP-8.1

Browse source 
* PHP-8.0:
  Fix cli server blocking on accept when using multiple workers
This commit is contained in:
Ilija Tovilo 2022-10-20 13:04:14 +02:00
commit 6be8efdf78
No known key found for this signature in database
GPG key ID: A4F5D403F118200A
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
sapi/cli/php_cli_server.c
View file

@ -2438,6 +2438,14 @@ static int php_cli_server_ctor(php_cli_server *server, const char *addr, const c
retval = FAILURE; retval = FAILURE;
goto out; goto out;
} }
// server_sock needs to be non-blocking when using multiple processes. Without it, the first process would
// successfully accept the connection but the others would block, causing client sockets of the same select
// call not to be handled.
if (SUCCESS != php_set_sock_blocking(server_sock, 0)) {
php_cli_server_logf(PHP_CLI_SERVER_LOG_ERROR, "Failed to make server socket non-blocking");
retval = FAILURE;
goto out;
}
server->server_sock = server_sock; server->server_sock = server_sock;
php_cli_server_startup_workers(); php_cli_server_startup_workers();
@ -2578,7 +2586,8 @@ static int php_cli_server_do_event_for_each_fd_callback(void *_params, php_socke
struct sockaddr *sa = pemalloc(server->socklen, 1); struct sockaddr *sa = pemalloc(server->socklen, 1);
client_sock = accept(server->server_sock, sa, &socklen); client_sock = accept(server->server_sock, sa, &socklen);
if (!ZEND_VALID_SOCKET(client_sock)) { if (!ZEND_VALID_SOCKET(client_sock)) {
if (php_cli_server_log_level >= PHP_CLI_SERVER_LOG_ERROR) { int err = php_socket_errno();
if (err != SOCK_EAGAIN && php_cli_server_log_level >= PHP_CLI_SERVER_LOG_ERROR) {
char *errstr = php_socket_strerror(php_socket_errno(), NULL, 0); char *errstr = php_socket_strerror(php_socket_errno(), NULL, 0);
php_cli_server_logf(PHP_CLI_SERVER_LOG_ERROR, php_cli_server_logf(PHP_CLI_SERVER_LOG_ERROR,
"Failed to accept a client (reason: %s)", errstr); "Failed to accept a client (reason: %s)", errstr);