X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FStreamFile.php;h=a7522ea2b5f73ff62f846ad34786f01f0d4bd892;hb=cb86baf4d48f615fc56acb992d472b825e6afefd;hp=ef82705988944e351290d8c8a11c3c35db3a0a89;hpb=f7afda4643b3ba586498f226bf55de4ae4b80968;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/StreamFile.php b/includes/StreamFile.php
index ef82705988..a7522ea2b5 100644
--- a/includes/StreamFile.php
+++ b/includes/StreamFile.php
@@ -39,10 +39,8 @@ class StreamFile {
 	 * @return bool Success
 	 */
 	public static function stream( $fname, $headers = array(), $sendErrors = true ) {
-		wfProfileIn( __METHOD__ );
 
 		if ( FileBackend::isStoragePath( $fname ) ) { // sanity
-			wfProfileOut( __METHOD__ );
 			throw new MWException( __FUNCTION__ . " given storage path '$fname'." );
 		}
 
@@ -54,14 +52,11 @@ class StreamFile {
 		if ( $res == self::NOT_MODIFIED ) {
 			$ok = true; // use client cache
 		} elseif ( $res == self::READY_STREAM ) {
-			wfProfileIn( __METHOD__ . '-send' );
 			$ok = readfile( $fname );
-			wfProfileOut( __METHOD__ . '-send' );
 		} else {
 			$ok = false; // failed
 		}
 
-		wfProfileOut( __METHOD__ );
 		return $ok;
 	}
 
@@ -83,7 +78,7 @@ class StreamFile {
 	) {
 		if ( !is_array( $info ) ) {
 			if ( $sendErrors ) {
-				header( 'HTTP/1.0 404 Not Found' );
+				HttpStatus::header( 404  );
 				header( 'Cache-Control: no-cache' );
 				header( 'Content-Type: text/html; charset=utf-8' );
 				$encFile = htmlspecialchars( $path );
@@ -131,7 +126,7 @@ class StreamFile {
 			$modsince = preg_replace( '/;.*$/', '', $_SERVER['HTTP_IF_MODIFIED_SINCE'] );
 			if ( wfTimestamp( TS_UNIX, $info['mtime'] ) <= strtotime( $modsince ) ) {
 				ini_set( 'zlib.output_compression', 0 );
-				header( "HTTP/1.0 304 Not Modified" );
+				HttpStatus::header( 304 );
 				return self::NOT_MODIFIED; // ok
 			}
 		}
@@ -158,10 +153,14 @@ class StreamFile {
 		# used for thumbnails (thumb.php)
 		if ( $wgTrivialMimeDetection ) {
 			switch ( $ext ) {
-				case 'gif': return 'image/gif';
-				case 'png': return 'image/png';
-				case 'jpg': return 'image/jpeg';
-				case 'jpeg': return 'image/jpeg';
+				case 'gif':
+					return 'image/gif';
+				case 'png':
+					return 'image/png';
+				case 'jpg':
+					return 'image/jpeg';
+				case 'jpeg':
+					return 'image/jpeg';
 			}
 
 			return 'unknown/unknown';