Merge "StreamFile: Deprecate ::parseRange() and ::send404Message() methods"

diff --combined RELEASE-NOTES-1.34
index d2dbce1,511ba65..2da3b55
--- 1/RELEASE-NOTES-1.34
--- 2/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@@ -429,7 -429,6 +429,7 @@@ because of Phabricator reports
    * Revision::selectTextFields()
    * Revision::selectPageFields()
    * Revision::selectUserFields()
 +* User::setNewpassword(), deprecated in 1.27 has been removed.
  
  === Deprecations in 1.34 ===
  * The MWNamespace class is deprecated. Use NamespaceInfo.
@@@ -565,6 -564,9 +565,9 @@@
  * The GetBlockedStatus hook is deprecated. Use GetUserBlock instead, to add or
    remove a block.
  * $wgContentHandlerUseDB is deprecated and should always be true.
+ * StreamFile::send404Message() and StreamFile::parseRange() are now deprecated.
+   Use HTTPFileStreamer::send404Message() and HTTPFileStreamer::parseRange()
+   respectively instead.
  
  === Other changes in 1.34 ===
  * …

diff --combined includes/StreamFile.php
index 2afd651,1c4b6ea..c9b2c33
--- 1/includes/StreamFile.php
--- 2/includes/StreamFile.php
+++ b/includes/StreamFile.php
@@@ -68,8 -68,10 +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 );
        }
  
@@@ -80,8 -82,10 +82,10 @@@
         * @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 );
        }
  
@@@ -107,6 -111,7 +111,6 @@@
                                case 'png':
                                        return 'image/png';
                                case 'jpg':
 -                                      return 'image/jpeg';
                                case 'jpeg':
                                        return 'image/jpeg';
                        }