X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=thumb.php;h=5c4eea7449cfd784f32ddac0c6303f108345cb33;hb=ad9f14d662f9597e9ca6bb4d1b572331b8256831;hp=051c39ea9dcc590fabc4443c3829c71215af69f9;hpb=c3f5ee0973fba27bab9a50f83eb637de72f7c659;p=lhc%2Fweb%2Fwiklou.git diff --git a/thumb.php b/thumb.php index 051c39ea9d..5c4eea7449 100644 --- a/thumb.php +++ b/thumb.php @@ -89,7 +89,6 @@ function wfThumbHandle404() { function wfStreamThumb( array $params ) { global $wgVaryOnXFP; - $headers = array(); // HTTP headers to send $fileName = isset( $params['f'] ) ? $params['f'] : ''; @@ -204,7 +203,7 @@ function wfStreamThumb( array $params ) { 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' ); @@ -231,11 +230,11 @@ function wfStreamThumb( array $params ) { // 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; } } @@ -270,7 +269,7 @@ function wfStreamThumb( array $params ) { } 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: ' . @@ -302,9 +301,14 @@ function wfStreamThumb( array $params ) { // 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 { + RequestContext::getMain()->getStats()->timing( 'media.thumbnail.stream', $streamtime ); } return; } @@ -318,8 +322,8 @@ function wfStreamThumb( array $params ) { return; } - // Actually generate a new thumbnail list( $thumb, $errorMsg ) = wfGenerateThumbnail( $img, $params, $thumbName, $thumbPath ); + /** @var MediaTransformOutput|bool $thumb */ // Check for thumbnail generation errors... @@ -554,14 +558,14 @@ function wfThumbError( $status, $msg ) { 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() ); @@ -571,7 +575,7 @@ function wfThumbError( $status, $msg ) { } else { $debug = ''; } - echo << @@ -587,4 +591,6 @@ $debug EOT; + header( 'Content-Length: ' . strlen( $content ) ); + echo $content; }