helly Wed Oct 2 11:36:29 2002 EDT
Modified files:
/php4 NEWS
/php4/main output.c
Log:
Fix implicit_flush
Index: php4/NEWS
diff -u php4/NEWS:1.1169 php4/NEWS:1.1170
--- php4/NEWS:1.1169 Wed Oct 2 04:14:47 2002
+++ php4/NEWS Wed Oct 2 11:36:28 2002
@@ -5,7 +5,7 @@
{PREFIX}/bin/php. If you don't disable the CGI binary, it will be
installed as {PREFIX}/bin/php-cgi.
- Fixed bug #17825 (ob_start() chunk size option didn't work well). (Yasuo)
-- Fixed output buffering implicit flush. (Yasuo)
+- Fixed output buffering implicit flush. (Yasuo, Marcus)
- Added getopt() for parsing command line options and arguments. (Jon)
- Added pg_fetch_assoc(), pg_fetch_all(), pg_ping(), pg_meta_data(), pg_convert(),
pg_insert(), pg_select(), pg_update(), pg_delete(), pg_data_seek() and
Index: php4/main/output.c
diff -u php4/main/output.c:1.127 php4/main/output.c:1.128
--- php4/main/output.c:1.127 Wed Oct 2 11:10:11 2002
+++ php4/main/output.c Wed Oct 2 11:36:29 2002
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: output.c,v 1.127 2002/10/02 15:10:11 helly Exp $ */
+/* $Id: output.c,v 1.128 2002/10/02 15:36:29 helly Exp $ */
#include "php.h"
#include "ext/standard/head.h"
@@ -595,13 +595,11 @@
/* 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) {
+ 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)
+ ) {
zval *output_handler = OG(active_ob_buffer).output_handler;
if (output_handler) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
