yohgaki Tue Oct 15 16:11:28 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4/main output.c
Log:
Sync with head
Index: php4/main/output.c
diff -u php4/main/output.c:1.88.2.4 php4/main/output.c:1.88.2.5
--- php4/main/output.c:1.88.2.4 Tue Oct 1 06:25:31 2002
+++ php4/main/output.c Tue Oct 15 16:11:27 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: output.c,v 1.88.2.4 2002/10/01 10:25:31 yohgaki Exp $ */
+/* $Id: output.c,v 1.88.2.5 2002/10/15 20:11:27 yohgaki Exp $ */
#include "php.h"
#include "ext/standard/head.h"
@@ -368,14 +368,6 @@
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
