yohgaki Mon Sep 30 22:43:33 2002 EDT
Modified files:
/php4/main output.c
Log:
Fixed implicit flush.
Index: php4/main/output.c
diff -u php4/main/output.c:1.123 php4/main/output.c:1.124
--- php4/main/output.c:1.123 Mon Sep 30 19:46:43 2002
+++ php4/main/output.c Mon Sep 30 22:43:33 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: output.c,v 1.123 2002/09/30 23:46:43 yohgaki Exp $ */
+/* $Id: output.c,v 1.124 2002/10/01 02:43:33 yohgaki Exp $ */
#include "php.h"
#include "ext/standard/head.h"
@@ -593,6 +593,14 @@
memcpy(target, text, text_length);
target[text_length]=0;
+ /* 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)) {
+ php_end_ob_buffer(1, 1 TSRMLS_CC);
+ return;
+ }
+
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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php