diff options
| author | Brion Vibber <brion@users.mediawiki.org> | 2006-12-11 01:51:21 +0000 |
|---|---|---|
| committer | Brion Vibber <brion@users.mediawiki.org> | 2006-12-11 01:51:21 +0000 |
| commit | a7dfa5da711c337f61333f17a6cb737147e1a09b (patch) | |
| tree | cc6f55e2d650f004ee5fb2bdaf06c8a7a8f63ca1 /includes/StreamFile.php | |
| parent | 4ff0b373ac6e6df1b6c73e66437fe0b7abd6fc82 (diff) | |
| download | mediawikicore-a7dfa5da711c337f61333f17a6cb737147e1a09b.tar.gz mediawikicore-a7dfa5da711c337f61333f17a6cb737147e1a09b.zip | |
* (bug 8148) Handle non-removable output buffers gracefully when cleaning
buffers for HTTP 304 responses, StreamFile, and Special:Export.
Duplicated code merged into wfResetOutputBuffers() and wfClearOutputBuffers()
Notes
Notes:
http://mediawiki.org/wiki/Special:Code/MediaWiki/18253
Diffstat (limited to 'includes/StreamFile.php')
| -rw-r--r-- | includes/StreamFile.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/includes/StreamFile.php b/includes/StreamFile.php index 641826986240..949422d6912e 100644 --- a/includes/StreamFile.php +++ b/includes/StreamFile.php @@ -22,12 +22,7 @@ function wfStreamFile( $fname ) { header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s', $stat['mtime'] ) . ' GMT' ); // Cancel output buffering and gzipping if set - while( $status = ob_get_status() ) { - ob_end_clean(); - if( $status['name'] == 'ob_gzhandler' ) { - header( 'Content-Encoding:' ); - } - } + wfResetOutputBuffers(); $type = wfGetType( $fname ); if ( $type and $type!="unknown/unknown") { |