helly Sat Mar 15 19:03:29 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/main main.c
/php4 NEWS
Log:
MFH bugfix #21751
Index: php4/main/main.c
diff -u php4/main/main.c:1.512.2.16 php4/main/main.c:1.512.2.17
--- php4/main/main.c:1.512.2.16 Wed Mar 12 07:01:01 2003
+++ php4/main/main.c Sat Mar 15 19:03:26 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.512.2.16 2003/03/12 12:01:01 sesser Exp $ */
+/* $Id: main.c,v 1.512.2.17 2003/03/16 00:03:26 helly Exp $ */
/* {{{ includes
*/
@@ -923,7 +923,7 @@
php_start_ob_buffer_named(PG(output_handler), 0, 1 TSRMLS_CC);
} else if (PG(output_buffering)) {
if (PG(output_buffering)>1) {
- php_start_ob_buffer(NULL, PG(output_buffering), 0
TSRMLS_CC);
+ php_start_ob_buffer(NULL, PG(output_buffering), 1
TSRMLS_CC);
} else {
php_start_ob_buffer(NULL, 0, 1 TSRMLS_CC);
}
Index: php4/NEWS
diff -u php4/NEWS:1.1247.2.141 php4/NEWS:1.1247.2.142
--- php4/NEWS:1.1247.2.141 Fri Mar 14 19:45:44 2003
+++ php4/NEWS Sat Mar 15 19:03:27 2003
@@ -89,6 +89,7 @@
- Fixed bug #21815 (fpassthru() ignored buffered data but complained anyway).
(Wez)
- Fixed bug #21809 (select would not always timeout during socket shutdown). (Wez)
+- Fixed bug #21751 (default output buffer could not be deleted). (Marcus)
- Fixed bug #21725 (return behaviour differs between include and require). (Zeev)
- Fixed bug #21713 (include remote files leaks descriptors on Solaris). (Wez)
- Fixed bug #21708 (ucwords() trouble again). (Moriyoshi)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
