Merge "Remove X-Content-Dimensions header"

This commit is contained in:
jenkins-bot 2017-06-10 15:29:40 +00:00 committed by Gerrit Code Review
commit 5591f8de4e

View file

@ -437,31 +437,4 @@ class PdfHandler extends ImageHandler {
'messages' => array_values( self::$messages ),
] );
}
/**
* Get useful response headers for GET/HEAD requests for a file with the given metadata
* @param $metadata Array Contains this handler's unserialized getMetadata() for a file
* @param $fallbackWidth int|null Width to fall back to if metadata doesn't have any
* @param $fallbackHeight int|null Height to fall back to if metadata doesn't have any
* @return Array
* @since 1.30
*/
public function getContentHeaders( $metadata, $fallbackWidth = null, $fallbackHeight = null ) {
$pagesByDimensions = [];
$count = intval( $metadata['Pages'] );
for ( $i = 1; $i <= $count; $i++ ) {
$dimensions = PdfImage::getPageSize( $metadata, $i );
$dimensionString = $dimensions['width'] . 'x' . $dimensions['height'];
if ( isset ( $pagesByDimensions[ $dimensionString ] ) ) {
$pagesByDimensions[ $dimensionString ][] = $i;
} else {
$pagesByDimensions[ $dimensionString ] = [ $i ];
}
}
$pageRangesByDimensions = MediaHandler::getPageRangesByDimensions( $pagesByDimensions );
return [ 'X-Content-Dimensions' => $pageRangesByDimensions ];
}
}