diff options
Diffstat (limited to 'sapi/cli/php_cli_server.c')
| -rw-r--r-- | sapi/cli/php_cli_server.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 4fe975d6a4..6d28b472d7 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -1123,7 +1123,7 @@ static void php_cli_server_log_response(php_cli_server_client *client, int statu { int color = 0, effective_status = status; char *basic_buf, *message_buf = "", *error_buf = ""; - zend_bool append_error_message = 0; + bool append_error_message = 0; if (PG(last_error_message)) { if (PG(last_error_type) & E_FATAL_ERRORS) { @@ -1821,12 +1821,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; } @@ -2736,7 +2732,7 @@ int do_cli_server(int argc, char **argv) /* {{{ */ sapi_module.phpinfo_as_text = 0; { - zend_bool ipv6 = strchr(server.host, ':'); + bool ipv6 = strchr(server.host, ':'); php_cli_server_logf( PHP_CLI_SERVER_LOG_PROCESS, "PHP %s Development Server (http://%s%s%s:%d) started", |