MFH: Fixed bug #42473 (ob_start php://output and headers)

diff --git a/NEWS b/NEWS
index badcb487b0dd9a89911c337d4cb452de05aedd25..e397ce49fb5169fad6e167ad2120f1f093f0547d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ PHP                                                                        NEWS
   references). (robin_fernandes at uk dot ibm dot com)
 - Fixed bug #44181 (extract($a, EXTR_OVERWRITE|EXTR_REFS) can fail to create 
   references to $a). (robin_fernandes at uk dot ibm dot com)
+- Fixed bug #42473 (ob_start php://output and headers). (Arnaud)
 
 20 Nov 2008, PHP 5.2.7RC4
 - Added logging option for error_log to send directly to SAPI. (Stas)

diff --git a/ext/standard/php_fopen_wrapper.c b/ext/standard/php_fopen_wrapper.c
index 3d42b18a49b5087b8c6b37aec4149d66a881b49a..9d7c5375c45821248c806ecd9b7f1a72cda4c970 100644 (file)
--- a/ext/standard/php_fopen_wrapper.c
+++ b/ext/standard/php_fopen_wrapper.c
@@ -48,17 +48,11 @@ static int php_stream_output_close(php_stream *stream, int close_handle TSRMLS_D
        return 0;
 }
 
-static int php_stream_output_flush(php_stream *stream TSRMLS_DC)
-{
-       sapi_flush(TSRMLS_C);
-       return 0;
-}
-
 php_stream_ops php_stream_output_ops = {
        php_stream_output_write,
        php_stream_output_read,
        php_stream_output_close,
-       php_stream_output_flush,
+       NULL, /* flush */
        "Output",
        NULL, /* seek */
        NULL, /* cast */