X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=thumb.php;h=12173c55ddae9f31d28f05d08d52c9df2b89ee2c;hb=795c8958840771e3a8603c417af3f0c464cf3cbd;hp=0d0a15ebcfed1ba1222b8760f63375e884143c2e;hpb=103eff5bcdafdafdddf0e2744ed168352a6ec77c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/thumb.php b/thumb.php
index 0d0a15ebcf..12173c55dd 100644
--- a/thumb.php
+++ b/thumb.php
@@ -213,6 +213,7 @@ function wfStreamThumb( array $params ) {
 			if ( count( $varyHeader ) ) {
 				$response->header( 'Vary: ' . implode( ', ', $varyHeader ) );
 			}
+			$response->header( 'Content-Length: 0' );
 			return;
 		}
 
@@ -298,8 +299,6 @@ function wfStreamThumb( array $params ) {
 		$headers[] = 'Vary: ' . implode( ', ', $varyHeader );
 	}
 
-	$stats = RequestContext::getMain()->getStats();
-
 	// Stream the file if it exists already...
 	$thumbPath = $img->getThumbPath( $thumbName );
 	if ( $img->getRepo()->fileExists( $thumbPath ) ) {
@@ -310,7 +309,7 @@ function wfStreamThumb( array $params ) {
 		if ( !$success ) {
 			wfThumbError( 500, 'Could not stream the file' );
 		} else {
-			$stats->timing( 'media.thumbnail.stream', $streamtime );
+			RequestContext::getMain()->getStats()->timing( 'media.thumbnail.stream', $streamtime );
 		}
 		return;
 	}
@@ -324,10 +323,8 @@ function wfStreamThumb( array $params ) {
 		return;
 	}
 
-	// Actually generate a new thumbnail
-	$starttime = microtime( true );
 	list( $thumb, $errorMsg ) = wfGenerateThumbnail( $img, $params, $thumbName, $thumbPath );
-	$generatetime = microtime( true ) - $starttime;
+
 	/** @var MediaTransformOutput|bool $thumb */
 
 	// Check for thumbnail generation errors...
@@ -348,8 +345,6 @@ function wfStreamThumb( array $params ) {
 	if ( $errorMsg !== false ) {
 		wfThumbError( $errorCode, $errorMsg );
 	} else {
-		$stats->timing( 'media.thumbnail.generate', $generatetime );
-
 		// Stream the file if there were no errors
 		$success = $thumb->streamFile( $headers );
 		if ( !$success ) {