From: Zeev Suraski <zeev@php.net>
Date: Thu, 13 Jan 2000 17:54:51 +0000 (+0000)
Subject: Woops, forgot to commit the right version of the file...
X-Git-Tag: BEFORE_PRE_SHUTDOWN_REVERSE_PATCH~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f74baed0291e746d9b8da208d30a4f32b741504;p=php

Woops, forgot to commit the right version of the file...
---

diff --git a/ext/standard/output.c b/ext/standard/output.c
index 5ba4c92831..1679a4491f 100644
--- a/ext/standard/output.c
+++ b/ext/standard/output.c
@@ -67,6 +67,7 @@ PHP_FUNCTION(ob_start);
 PHP_FUNCTION(ob_end_flush);
 PHP_FUNCTION(ob_end_clean);
 PHP_FUNCTION(ob_get_contents);
+PHP_FUNCTION(ob_implicit_flush);
 
 
 static void php_output_init_globals(OLS_D)
@@ -97,6 +98,7 @@ static zend_function_entry php_output_functions[] = {
 	PHP_FE(ob_end_flush,				NULL)
 	PHP_FE(ob_end_clean,				NULL)
 	PHP_FE(ob_get_contents,				NULL)
+	PHP_FE(ob_implicit_flush,			NULL)
 	{NULL, NULL, NULL}
 };
 
@@ -184,13 +186,18 @@ PHPAPI void php_end_ob_buffering(int send_buffer)
 
 PHPAPI void php_start_implicit_flush()
 {
-	php_end_ob_buffering(1);		/* Switch out of output buffering if we're in it */
+	OLS_FETCH();
 
+	php_end_ob_buffering(1);		/* Switch out of output buffering if we're in it */
+	OG(implicit_flush)=1;
 }
 
 
 PHPAPI void php_end_implicit_flush()
 {
+	OLS_FETCH();
+
+	OG(implicit_flush)=0;
 }
 
 
@@ -329,6 +336,9 @@ static int php_ub_body_write_no_header(const char *str, uint str_length)
 		free(newstr);
 	}
 
+	if (OG(implicit_flush)) {
+		sapi_flush();
+	}
 
 	return result;
 }
@@ -400,6 +410,11 @@ PHP_FUNCTION(ob_implicit_flush)
 			flag = (*zv_flag)->value.lval;
 			break;
 	}
+	if (flag) {
+		php_start_implicit_flush();
+	} else {
+		php_end_implicit_flush();
+	}
 }
 
 
diff --git a/main/output.c b/main/output.c
index 5ba4c92831..1679a4491f 100644
--- a/main/output.c
+++ b/main/output.c
@@ -67,6 +67,7 @@ PHP_FUNCTION(ob_start);
 PHP_FUNCTION(ob_end_flush);
 PHP_FUNCTION(ob_end_clean);
 PHP_FUNCTION(ob_get_contents);
+PHP_FUNCTION(ob_implicit_flush);
 
 
 static void php_output_init_globals(OLS_D)
@@ -97,6 +98,7 @@ static zend_function_entry php_output_functions[] = {
 	PHP_FE(ob_end_flush,				NULL)
 	PHP_FE(ob_end_clean,				NULL)
 	PHP_FE(ob_get_contents,				NULL)
+	PHP_FE(ob_implicit_flush,			NULL)
 	{NULL, NULL, NULL}
 };
 
@@ -184,13 +186,18 @@ PHPAPI void php_end_ob_buffering(int send_buffer)
 
 PHPAPI void php_start_implicit_flush()
 {
-	php_end_ob_buffering(1);		/* Switch out of output buffering if we're in it */
+	OLS_FETCH();
 
+	php_end_ob_buffering(1);		/* Switch out of output buffering if we're in it */
+	OG(implicit_flush)=1;
 }
 
 
 PHPAPI void php_end_implicit_flush()
 {
+	OLS_FETCH();
+
+	OG(implicit_flush)=0;
 }
 
 
@@ -329,6 +336,9 @@ static int php_ub_body_write_no_header(const char *str, uint str_length)
 		free(newstr);
 	}
 
+	if (OG(implicit_flush)) {
+		sapi_flush();
+	}
 
 	return result;
 }
@@ -400,6 +410,11 @@ PHP_FUNCTION(ob_implicit_flush)
 			flag = (*zv_flag)->value.lval;
 			break;
 	}
+	if (flag) {
+		php_start_implicit_flush();
+	} else {
+		php_end_implicit_flush();
+	}
 }