MFH: cli overrides php.ini and switches output buffering off.

diff --git a/NEWS b/NEWS
index dff8f192707d4c0e359177105aff31655edb4860..5d0d57aff521f92da6c71e28a8b35ebbbf99d83c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2003, Version 4.3.5
+- CLI now overrides php.ini settings and switches off output buffering. This
+  fixes issue described in bug #26755. (Edin)
 - Synchronized bundled GD library with GD 2.0.17
 - Upgraded PCRE library to version 4.5. (Andrei)
 - Updated bundled PostgreSQL library to version 7.4 in Windows distribution.

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index de8e6096a99603dc4404486acc91ede4a341c718..b2c08ed6ed418f77951085ab3e9685fa73def6df 100644 (file)
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -655,6 +655,7 @@ int main(int argc, char *argv[])
                INI_HARDCODED("register_argc_argv", "1");
                INI_HARDCODED("html_errors", "0");
                INI_HARDCODED("implicit_flush", "1");
+               INI_HARDCODED("output_buffering", "0");
                INI_HARDCODED("max_execution_time", "0");
 
                optind = orig_optind;