derick Thu Oct 3 06:35:34 2002 EDT
Modified files:
/php4/main output.c
/php4/ext/standard var.c basic_functions.c
/php4/sapi/cli php_cli.c
Log:
- Revert changed to implicit_flush behavior. The new behavior was not
intended in the first place.
Index: php4/main/output.c
diff -u php4/main/output.c:1.134 php4/main/output.c:1.135
--- php4/main/output.c:1.134 Thu Oct 3 04:54:13 2002
+++ php4/main/output.c Thu Oct 3 06:35:32 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: output.c,v 1.134 2002/10/03 08:54:13 yohgaki Exp $ */
+/* $Id: output.c,v 1.135 2002/10/03 10:35:32 derick Exp $ */
#include "php.h"
#include "ext/standard/head.h"
@@ -596,11 +596,8 @@
/* If implicit_flush is On, send contents to next buffer and return.
Both PG() and OG() should be used since we should flush implicitly
always when implicit_flush is enabled in php.ini */
- if (PG(implicit_flush) || OG(implicit_flush)
- /* Also flush after each chunk if output is chunked */
- || (OG(active_ob_buffer).chunk_size
- && OG(active_ob_buffer).text_length >=
OG(active_ob_buffer).chunk_size)
- ) {
+ if (OG(active_ob_buffer).chunk_size
+ && OG(active_ob_buffer).text_length >=
+OG(active_ob_buffer).chunk_size) {
zval *output_handler = OG(active_ob_buffer).output_handler;
if (output_handler) {
Index: php4/ext/standard/var.c
diff -u php4/ext/standard/var.c:1.146 php4/ext/standard/var.c:1.147
--- php4/ext/standard/var.c:1.146 Thu Oct 3 04:54:45 2002
+++ php4/ext/standard/var.c Thu Oct 3 06:35:33 2002
@@ -342,23 +342,21 @@
PHP_FUNCTION(var_export)
{
zval *var;
- zend_bool return_output = 0;
+ zend_bool i = 0;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|b", &var,
&return_output) == FAILURE) {
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|b", &var, &i) ==
+FAILURE) {
return;
}
- if (return_output) {
- php_output_set_status(0 TSRMLS_CC);
+ if (i) {
php_start_ob_buffer (NULL, 0, 1 TSRMLS_CC);
}
php_var_export(&var, 1 TSRMLS_CC);
- if (return_output) {
+ if (i) {
php_ob_get_buffer (return_value TSRMLS_CC);
php_end_ob_buffer (0, 0 TSRMLS_CC);
- php_output_set_status(1 TSRMLS_CC);
}
}
/* }}} */
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.519
php4/ext/standard/basic_functions.c:1.520
--- php4/ext/standard/basic_functions.c:1.519 Thu Oct 3 05:19:31 2002
+++ php4/ext/standard/basic_functions.c Thu Oct 3 06:35:33 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.519 2002/10/03 09:19:31 yohgaki Exp $ */
+/* $Id: basic_functions.c,v 1.520 2002/10/03 10:35:33 derick Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -2077,7 +2077,6 @@
convert_to_string(expr);
if (i) {
- php_output_set_status(0 TSRMLS_CC);
php_start_ob_buffer (NULL, 0, 1 TSRMLS_CC);
}
@@ -2094,7 +2093,6 @@
if (i) {
php_ob_get_buffer (return_value TSRMLS_CC);
php_end_ob_buffer (0, 0 TSRMLS_CC);
- php_output_set_status(1 TSRMLS_CC);
} else {
RETURN_TRUE;
}
Index: php4/sapi/cli/php_cli.c
diff -u php4/sapi/cli/php_cli.c:1.34 php4/sapi/cli/php_cli.c:1.35
--- php4/sapi/cli/php_cli.c:1.34 Thu Oct 3 05:57:53 2002
+++ php4/sapi/cli/php_cli.c Thu Oct 3 06:35:33 2002
@@ -466,6 +466,7 @@
SG(options) |= SAPI_OPTION_NO_CHDIR;
zend_alter_ini_entry("register_argc_argv", 19, "1", 1, PHP_INI_SYSTEM,
PHP_INI_STAGE_ACTIVATE);
zend_alter_ini_entry("html_errors", 12, "0", 1, PHP_INI_SYSTEM,
PHP_INI_STAGE_ACTIVATE);
+ zend_alter_ini_entry("implicit_flush", 15, "1", 1, PHP_INI_SYSTEM,
+PHP_INI_STAGE_ACTIVATE);
zend_alter_ini_entry("max_execution_time", 19, "0", 1, PHP_INI_SYSTEM,
PHP_INI_STAGE_ACTIVATE);
zend_uv.html_errors = 0; /* tell the engine we're in non-html mode */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
