/** */
/** */
-function wfStreamFile( $fname ) {
+function wfStreamFile( $fname, $headers = array() ) {
$stat = @stat( $fname );
if ( !$stat ) {
header( 'HTTP/1.0 404 Not Found' );
header( 'Cache-Control: no-cache' );
+ header( 'Content-Type: text/html; charset=utf-8' );
$encFile = htmlspecialchars( $fname );
$encScript = htmlspecialchars( $_SERVER['SCRIPT_NAME'] );
echo "<html><body>
<h1>File not found</h1>
-<p>Although this PHP script ($encScript) exists, the file requested for output
+<p>Although this PHP script ($encScript) exists, the file requested for output
($encFile) does not.</p>
-</body></html>";
+</body></html>
+";
return;
}
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") {
header("Content-type: $type");
header('Content-type: application/x-wiki');
}
+ global $wgContLanguageCode;
+ header( "Content-Disposition: inline;filename*=utf-8'$wgContLanguageCode'" . urlencode( basename( $fname ) ) );
+
+ foreach ( $headers as $header ) {
+ header( $header );
+ }
+
if ( !empty( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) {
$modsince = preg_replace( '/;.*$/', '', $_SERVER['HTTP_IF_MODIFIED_SINCE'] );
$sinceTime = strtotime( $modsince );
return 'unknown/unknown';
}
else {
- $magic=& MimeMagic::singleton();
+ $magic = MimeMagic::singleton();
return $magic->guessMimeType($filename); //full fancy mime detection
}
}
-
-?>