function wfStreamThumb( array $params ) {
global $wgVaryOnXFP;
-
$headers = array(); // HTTP headers to send
$fileName = isset( $params['f'] ) ? $params['f'] : '';
if ( $redirectedLocation ) {
// File has been moved. Give redirect.
$response = RequestContext::getMain()->getRequest()->response();
- $response->header( "HTTP/1.1 302 " . HttpStatus::getMessage( 302 ) );
+ $response->statusHeader( 302 );
$response->header( 'Location: ' . $redirectedLocation );
$response->header( 'Expires: ' .
gmdate( 'D, d M Y H:i:s', time() + 12 * 3600 ) . ' GMT' );
// Fix IE brokenness
$imsString = preg_replace( '/;.*$/', '', $_SERVER["HTTP_IF_MODIFIED_SINCE"] );
// Calculate time
- wfSuppressWarnings();
+ MediaWiki\suppressWarnings();
$imsUnix = strtotime( $imsString );
- wfRestoreWarnings();
+ MediaWiki\restoreWarnings();
if ( wfTimestamp( TS_UNIX, $img->getTimestamp() ) <= $imsUnix ) {
- header( 'HTTP/1.1 304 Not Modified' );
+ HttpStatus::header( 304 );
return;
}
}
} elseif ( rawurldecode( $rel404 ) === $img->getThumbRel( $thumbName2 ) ) {
// Request for the "long" thumbnail name; redirect to canonical name
$response = RequestContext::getMain()->getRequest()->response();
- $response->header( "HTTP/1.1 301 " . HttpStatus::getMessage( 301 ) );
+ $response->statusHeader( 301 );
$response->header( 'Location: ' .
wfExpandUrl( $img->getThumbUrl( $thumbName ), PROTO_CURRENT ) );
$response->header( 'Expires: ' .
$headers[] = 'Vary: ' . implode( ', ', $varyHeader );
}
+ $stats = RequestContext::getMain()->getStats();
+
// Stream the file if it exists already...
$thumbPath = $img->getThumbPath( $thumbName );
if ( $img->getRepo()->fileExists( $thumbPath ) ) {
+ $starttime = microtime( true );
$success = $img->getRepo()->streamFile( $thumbPath, $headers );
+ $streamtime = microtime( true ) - $starttime;
+
if ( !$success ) {
wfThumbError( 500, 'Could not stream the file' );
+ } else {
+ $stats->timing( 'media.thumbnail.stream', $streamtime );
}
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...
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 ) {
header( 'Cache-Control: no-cache' );
header( 'Content-Type: text/html; charset=utf-8' );
if ( $status == 400 ) {
- header( 'HTTP/1.1 400 Bad request' );
+ HttpStatus::header( 400 );
} elseif ( $status == 404 ) {
- header( 'HTTP/1.1 404 Not found' );
+ HttpStatus::header( 404 );
} elseif ( $status == 403 ) {
- header( 'HTTP/1.1 403 Forbidden' );
+ HttpStatus::header( 403 );
header( 'Vary: Cookie' );
} else {
- header( 'HTTP/1.1 500 Internal server error' );
+ HttpStatus::header( 500 );
}
if ( $wgShowHostnames ) {
header( 'X-MW-Thumbnail-Renderer: ' . wfHostname() );
} else {
$debug = '';
}
- echo <<<EOT
+ $content = <<<EOT
<!DOCTYPE html>
<html><head>
<meta charset="UTF-8" />
</html>
EOT;
+ header( 'Content-Length: ' . strlen( $content ) );
+ echo $content;
}