From: Arnaud Le Blanc <lbarnaud@php.net>
Date: Tue, 25 Nov 2008 03:49:21 +0000 (+0000)
Subject: Fixed endless loop in cli when ignore_user_abort is on
X-Git-Tag: BEFORE_HEAD_NS_CHANGES_MERGE~88
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=76e5580b2ef27926a38cae7a1b68106433dbb068;p=php

Fixed endless loop in cli when ignore_user_abort is on
---

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index ec80cd32d1..bc50e1b688 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -264,11 +264,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;