Re: cvs: php4 /sapi/cli php_cli.c

Well, it mostly fixed the tests :) The problem is that if one doesn't flush, then on console everything is OK, but if you use some buffered stream (e.g., popen, or even maybe file) then the banner can get inside the rest of the output and not at the start. Using interactive mode outside console is a bit esoteric, but the tests did fail. I'm not sure if it really requires merging... JT>> JT>> MFH? (what exactly did this fix/change? :) JT>> JT>> --Jani JT>> JT>> On Mon, 16 Jun 2003, Stanislav Malyshev wrote: JT>> JT>> >stas Mon Jun 16 12:14:38 2003 EDT JT>> > JT>> > Modified files: JT>> > /php4/sapi/cli php_cli.c JT>> > Log: JT>> > flush after banner print JT>> > JT>> > JT>> >Index: php4/sapi/cli/php_cli.c JT>> >diff -u php4/sapi/cli/php_cli.c:1.94 php4/sapi/cli/php_cli.c:1.95 JT>> >--- php4/sapi/cli/php_cli.c:1.94 Tue Jun 10 16:03:45 2003 JT>> >+++ php4/sapi/cli/php_cli.c Mon Jun 16 12:14:38 2003 JT>> >@@ -19,7 +19,7 @@ JT>> > +----------------------------------------------------------------------+ JT>> > */ JT>> > JT>> >-/* $Id: php_cli.c,v 1.94 2003/06/10 20:03:45 imajes Exp $ */ JT>> >+/* $Id: php_cli.c,v 1.95 2003/06/16 16:14:38 stas Exp $ */ JT>> > JT>> > #include "php.h" JT>> > #include "php_globals.h" JT>> >@@ -680,6 +680,7 @@ JT>> > JT>> > case 'a': /* interactive mode */ JT>> > printf("Interactive mode enabled\n\n"); JT>> >+ fflush(stdout); JT>> > interactive=1; JT>> > break; JT>> > JT>> -- Stanislav Malyshev, Zend Products Engineer stas@zend.com http://www.zend.com/ +972-3-6139665 ext.109