summaryrefslogtreecommitdiff
path: root/sapi/cli/php_cli_server.c
diff options
context:
space:
mode:
authorGeorge Peter Banyard <girgias@php.net>2020-09-30 14:34:10 +0100
committerGeorge Peter Banyard <girgias@php.net>2020-10-09 20:54:39 +0100
commita29b4a7bea4ac68fa05b6d67524bb0d8930dc4cb (patch)
tree7b9a6dc4e6854307776c47b292ec0494113d3e84 /sapi/cli/php_cli_server.c
parent3b22b5fdf6cd761eba65140b23d97d9c1f8c9997 (diff)
downloadphp-git-a29b4a7bea4ac68fa05b6d67524bb0d8930dc4cb.tar.gz
Fix [-Wduplicated-branches] in CLI SAPI
Diffstat (limited to 'sapi/cli/php_cli_server.c')
-rw-r--r--sapi/cli/php_cli_server.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index a32b51e3d3..636e1de122 100644
--- a/sapi/cli/php_cli_server.c
+++ b/sapi/cli/php_cli_server.c
@@ -1879,12 +1879,8 @@ static size_t php_cli_server_client_send_through(php_cli_server_client *client,
int nfds = php_pollfd_for(client->sock, POLLOUT, &tv);
if (nfds > 0) {
continue;
- } else if (nfds < 0) {
- /* error */
- php_handle_aborted_connection();
- return nbytes_left;
} else {
- /* timeout */
+ /* error or timeout */
php_handle_aborted_connection();
return nbytes_left;
}