fix bug #28071. Many video previews are relatively large, esp. since MediaWiki only...

[lhc/web/wiklou.git] / includes / StreamFile.php

diff --git a/includes/StreamFile.php b/includes/StreamFile.php
index 4abd736..5f460ee 100644 (file)
--- a/includes/StreamFile.php
+++ b/includes/StreamFile.php
@@ -1,5 +1,9 @@
 <?php
-/** */
+/**
+ * Functions related to the output of file content
+ *
+ * @file
+ */
 
 /** */
 function wfStreamFile( $fname, $headers = array() ) {
@@ -37,8 +41,8 @@ function wfStreamFile( $fname, $headers = array() ) {
                return;
        }
 
-       global $wgContLanguageCode;
-       header( "Content-Disposition: inline;filename*=utf-8'$wgContLanguageCode'" . urlencode( basename( $fname ) ) );
+       global $wgLanguageCode;
+       header( "Content-Disposition: inline;filename*=utf-8'$wgLanguageCode'" . urlencode( basename( $fname ) ) );
 
        foreach ( $headers as $header ) {
                header( $header );
@@ -48,6 +52,7 @@ function wfStreamFile( $fname, $headers = array() ) {
                $modsince = preg_replace( '/;.*$/', '', $_SERVER['HTTP_IF_MODIFIED_SINCE'] );
                $sinceTime = strtotime( $modsince );
                if ( $stat['mtime'] <= $sinceTime ) {
+                       ini_set('zlib.output_compression', 0);
                        header( "HTTP/1.0 304 Not Modified" );
                        return;
                }
@@ -90,14 +95,13 @@ function wfGetType( $filename, $safe = true ) {
         */
        if ( $safe ) {
                global $wgFileBlacklist, $wgCheckFileExtensions, $wgStrictFileExtensions, 
-                       $wgFileExtensions, $wgVerifyMimeType, $wgMimeTypeBlacklist, $wgRequest;
-               $form = new UploadForm( $wgRequest );
-               list( $partName, $extList ) = $form->splitExtensions( $filename );
-               if ( $form->checkFileExtensionList( $extList, $wgFileBlacklist ) ) {
+                       $wgFileExtensions, $wgVerifyMimeType, $wgMimeTypeBlacklist;
+               list( , $extList ) = UploadBase::splitExtensions( $filename );
+               if ( UploadBase::checkFileExtensionList( $extList, $wgFileBlacklist ) ) {
                        return 'unknown/unknown';
                }
                if ( $wgCheckFileExtensions && $wgStrictFileExtensions 
-                       && !$form->checkFileExtensionList( $extList, $wgFileExtensions ) )
+                       && !UploadBase::checkFileExtensionList( $extList, $wgFileExtensions ) )
                {
                        return 'unknown/unknown';
                }