lbarnaud                Tue Nov 25 03:53:00 2008 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/sapi/cli   php_cli.c 
  Log:
  MFH: Fixed endless loop in cli when ignore_user_abort is on
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/php_cli.c?r1=1.129.2.13.2.28&r2=1.129.2.13.2.29&diff_format=u
Index: php-src/sapi/cli/php_cli.c
diff -u php-src/sapi/cli/php_cli.c:1.129.2.13.2.28 
php-src/sapi/cli/php_cli.c:1.129.2.13.2.29
--- php-src/sapi/cli/php_cli.c:1.129.2.13.2.28  Mon Nov  3 23:26:24 2008
+++ php-src/sapi/cli/php_cli.c  Tue Nov 25 03:53:00 2008
@@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: php_cli.c,v 1.129.2.13.2.28 2008/11/03 23:26:24 lbarnaud Exp $ */
+/* $Id: php_cli.c,v 1.129.2.13.2.29 2008/11/25 03:53:00 lbarnaud Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -260,11 +260,10 @@
        {
                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;



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to