| Index: branches/REL1_17/phase3/includes/GlobalFunctions.php |
| — | — | @@ -1750,7 +1750,13 @@ |
| 1751 | 1751 | if( $status['name'] == 'ob_gzhandler' ) { |
| 1752 | 1752 | // Reset the 'Content-Encoding' field set by this handler |
| 1753 | 1753 | // so we can start fresh. |
| 1754 | | - header( 'Content-Encoding:' ); |
| | 1754 | + if ( function_exists( 'header_remove' ) ) { |
| | 1755 | + // Available since PHP 5.3.0 |
| | 1756 | + header_remove( 'Content-Encoding' ); |
| | 1757 | + } else { |
| | 1758 | + // We need to provide a valid content-coding. See bug 28069 |
| | 1759 | + header( 'Content-Encoding: identity' ); |
| | 1760 | + } |
| 1755 | 1761 | break; |
| 1756 | 1762 | } |
| 1757 | 1763 | } |
| Property changes on: branches/REL1_17/phase3/includes/GlobalFunctions.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1758 | 1764 | Merged /trunk/phase3/includes/GlobalFunctions.php:r84060 |
| Index: branches/REL1_17/phase3/RELEASE-NOTES |
| — | — | @@ -499,6 +499,8 @@ |
| 500 | 500 | * (bug 27781) Installer does not warn about 5.1.x. Added a compatibility function |
| 501 | 501 | for array_key_exists(). |
| 502 | 502 | * Fix XML well-formedness on a few pages when $wgHtml5 is true (the default) |
| | 503 | +* (bug 28069) MediaWiki fails streaming files when mod_deflate and ob_gzhandler |
| | 504 | + are also set. |
| 503 | 505 | |
| 504 | 506 | === API changes in 1.17 === |
| 505 | 507 | * BREAKING CHANGE: action=patrol now requires POST |