MFH bugfix #21751

diff --git a/NEWS b/NEWS
index 4a03a6305ad8ac77b216b99d13f9c0f0539e197e..66fdf1976525cbd6e8fb591469dbad8127b00bce 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -89,6 +89,7 @@ PHP 4                                                                      NEWS
 - 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)

diff --git a/main/main.c b/main/main.c
index 5e0203483f590b8260f4b505bc382a7127ab259e..529409cb42f38bfabbf1a6aa794f033111d7c58a 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -923,7 +923,7 @@ int php_request_startup(TSRMLS_D)
                        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);
                        }