X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FStreamFile.php;h=c9b2c33b9a7ae25b2341e2cd7646a55d5a844b23;hb=f97d13a10c1b7dac7c4463c3ccc75e21a731c7a2;hp=71113a8691dc798388f185086358ea59e7752edf;hpb=a8ec960e9d910acbcd0d50efad3bd73e3ae812aa;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/StreamFile.php b/includes/StreamFile.php
index 71113a8691..c9b2c33b9a 100644
--- a/includes/StreamFile.php
+++ b/includes/StreamFile.php
@@ -25,8 +25,10 @@
  */
 class StreamFile {
 	// Do not send any HTTP headers unless requested by caller (e.g. body only)
+	/** @deprecated since 1.34 */
 	const STREAM_HEADLESS = HTTPFileStreamer::STREAM_HEADLESS;
 	// Do not try to tear down any PHP output buffers
+	/** @deprecated since 1.34 */
 	const STREAM_ALLOW_OB = HTTPFileStreamer::STREAM_ALLOW_OB;
 
 	/**
@@ -66,8 +68,10 @@ class StreamFile {
 	 * @param string $fname Full name and path of the file to stream
 	 * @param int $flags Bitfield of STREAM_* constants
 	 * @since 1.24
+	 * @deprecated since 1.34, use HTTPFileStreamer::send404Message() instead
 	 */
 	public static function send404Message( $fname, $flags = 0 ) {
+		wfDeprecated( __METHOD__, '1.34' );
 		HTTPFileStreamer::send404Message( $fname, $flags );
 	}
 
@@ -78,8 +82,10 @@ class StreamFile {
 	 * @param int $size File size
 	 * @return array|string Returns error string on failure (start, end, length)
 	 * @since 1.24
+	 * @deprecated since 1.34, use HTTPFileStreamer::parseRange() instead
 	 */
 	public static function parseRange( $range, $size ) {
+		wfDeprecated( __METHOD__, '1.34' );
 		return HTTPFileStreamer::parseRange( $range, $size );
 	}
 
@@ -105,7 +111,6 @@ class StreamFile {
 				case 'png':
 					return 'image/png';
 				case 'jpg':
-					return 'image/jpeg';
 				case 'jpeg':
 					return 'image/jpeg';
 			}
@@ -113,7 +118,7 @@ class StreamFile {
 			return 'unknown/unknown';
 		}
 
-		$magic = MimeMagic::singleton();
+		$magic = MediaWiki\MediaWikiServices::getInstance()->getMimeAnalyzer();
 		// Use the extension only, rather than magic numbers, to avoid opening
 		// up vulnerabilities due to uploads of files with allowed extensions
 		// but disallowed types.