summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnaud Le Blanc <lbarnaud@php.net>2008-11-25 03:52:00 +0000
committerArnaud Le Blanc <lbarnaud@php.net>2008-11-25 03:52:00 +0000
commitcc2c72091233930ad17d14c8388b4cd272fef112 (patch)
tree49ec4f4c7e35315cc6c4f381543a266b80f18687
parent281676da26f4570236c11a0eb41e7072b68e548b (diff)
downloadphp-git-cc2c72091233930ad17d14c8388b4cd272fef112.tar.gz
MFH: Fixed endless loop in cli when ignore_user_abort is on
-rw-r--r--sapi/cli/php_cli.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 4b9d112ed7..e554051d29 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -260,11 +260,10 @@ static int sapi_cli_ub_write(const char *str, uint str_length TSRMLS_DC) /* {{{
{
ret = sapi_cli_single_write(ptr, remaining);
if (!ret) {
-#ifdef PHP_CLI_WIN32_NO_CONSOLE
- break;
-#else
+#ifndef PHP_CLI_WIN32_NO_CONSOLE
php_handle_aborted_connection();
#endif
+ break;
}
ptr += ret;
remaining -= ret;