Prevent unwanted fluhsing.

Yasuo Ohgaki · Yasuo Ohgaki · commit 17317672726e · 2002-10-03T08:54:45.000Z
diff --git a/ext/standard/var.c b/ext/standard/var.c
@@ -342,21 +342,23 @@ void php_var_export(zval **struc, int level TSRMLS_DC)
 PHP_FUNCTION(var_export)
 {
 	zval *var;
-	zend_bool  i = 0;
+	zend_bool return_output = 0;
 	
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|b", &var, &i) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|b", &var, &return_output) == FAILURE) {
 		return;
 	}
 	
-	if (i) {
+	if (return_output) {
+		php_output_set_status(0 TSRMLS_CC);
 		php_start_ob_buffer (NULL, 0, 1 TSRMLS_CC);
 	}
 	
 	php_var_export(&var, 1 TSRMLS_CC);
 
-	if (i) {
+	if (return_output) {
 		php_ob_get_buffer (return_value TSRMLS_CC);
 		php_end_ob_buffer (0, 0 TSRMLS_CC);
+		php_output_set_status(1 TSRMLS_CC);
 	}
 }
 /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -342,21 +342,23 @@ void php_var_export(zval **struc, int level TSRMLS_DC)`
`342`	`342`	`PHP_FUNCTION(var_export)`
`343`	`343`	`{`
`344`	`344`	`zval *var;`
`345`		`- zend_bool i = 0;`
	`345`	`+ zend_bool return_output = 0;`
`346`	`346`
`347`		`- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z\|b", &var, &i) == FAILURE) {`
	`347`	`+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z\|b", &var, &return_output) == FAILURE) {`
`348`	`348`	`return;`
`349`	`349`	`}`
`350`	`350`
`351`		`- if (i) {`
	`351`	`+ if (return_output) {`
	`352`	`+ php_output_set_status(0 TSRMLS_CC);`
`352`	`353`	`php_start_ob_buffer (NULL, 0, 1 TSRMLS_CC);`
`353`	`354`	`}`
`354`	`355`
`355`	`356`	`php_var_export(&var, 1 TSRMLS_CC);`
`356`	`357`
`357`		`- if (i) {`
	`358`	`+ if (return_output) {`
`358`	`359`	`php_ob_get_buffer (return_value TSRMLS_CC);`
`359`	`360`	`php_end_ob_buffer (0, 0 TSRMLS_CC);`
	`361`	`+ php_output_set_status(1 TSRMLS_CC);`
`360`	`362`	`}`
`361`	`363`	`}`
`362`	`364`	`/* }}} */`