/** */
/** */
-function wfStreamFile( $fname ) {
- global $wgSquidMaxage;
+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 ({$_SERVER['SCRIPT_NAME']}) exists, the file requested for output
-does not.</p>
-</body></html>";
+<p>Although this PHP script ($encScript) exists, the file requested for output
+($encFile) does not.</p>
+</body></html>
+";
return;
}
header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s', $stat['mtime'] ) . ' GMT' );
+ // Cancel output buffering and gzipping if set
+ wfResetOutputBuffers();
+
+ $type = wfGetType( $fname );
+ if ( $type and $type!="unknown/unknown") {
+ header("Content-type: $type");
+ } else {
+ 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;
}
}
-
+
header( 'Content-Length: ' . $stat['size'] );
-
- $type = wfGetType( $fname );
- if ( $type and $type!="unknown/unknown") {
- header("Content-type: $type");
- } else {
- header('Content-type: application/x-wiki');
- }
-
+
readfile( $fname );
}
# used for thumbnails (thumb.php)
if ($wgTrivialMimeDetection) {
$ext= strtolower(strrchr($filename, '.'));
-
+
switch ($ext) {
case '.gif': return 'image/gif';
case '.png': return 'image/png';
case '.jpg': return 'image/jpeg';
case '.jpeg': return 'image/jpeg';
}
-
+
return 'unknown/unknown';
}
else {
- $magic=& wfGetMimeMagic();
+ $magic=& MimeMagic::singleton();
return $magic->guessMimeType($filename); //full fancy mime detection
}
}
-?>
+