From 635ac7aeed42814c2d8a61e246eed6a95f1d7f95 Mon Sep 17 00:00:00 2001 From: Gilles Dubuc Date: Thu, 21 Sep 2017 15:17:10 +0200 Subject: [PATCH] Clean up X-Content-Dimensions Bug: T175689 Change-Id: I20d93afd85b4d35c67c60193fa3026cebde71b0e --- includes/media/MediaHandler.php | 2 +- maintenance/refreshFileHeaders.php | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/includes/media/MediaHandler.php b/includes/media/MediaHandler.php index aa7c62be9d..481e880cfe 100644 --- a/includes/media/MediaHandler.php +++ b/includes/media/MediaHandler.php @@ -921,6 +921,6 @@ abstract class MediaHandler { * @since 1.30 */ public function getContentHeaders( $metadata ) { - return []; + return [ 'X-Content-Dimensions' => '' ]; // T175689 } } diff --git a/maintenance/refreshFileHeaders.php b/maintenance/refreshFileHeaders.php index bca1c96435..fd3faeb622 100644 --- a/maintenance/refreshFileHeaders.php +++ b/maintenance/refreshFileHeaders.php @@ -37,6 +37,9 @@ class RefreshFileHeaders extends Maintenance { $this->addOption( 'verbose', 'Output information about each file.', false, false, 'v' ); $this->addOption( 'start', 'Name of file to start with', false, true ); $this->addOption( 'end', 'Name of file to end with', false, true ); + $this->addOption( 'media_type', 'Media type to filter for', false, true ); + $this->addOption( 'major_mime', 'Major mime type to filter for', false, true ); + $this->addOption( 'minor_mime', 'Minor mime type to filter for', false, true ); $this->setBatchSize( 200 ); } @@ -44,6 +47,12 @@ class RefreshFileHeaders extends Maintenance { $repo = RepoGroup::singleton()->getLocalRepo(); $start = str_replace( ' ', '_', $this->getOption( 'start', '' ) ); // page on img_name $end = str_replace( ' ', '_', $this->getOption( 'end', '' ) ); // page on img_name + // filter by img_media_type + $media_type = str_replace( ' ', '_', $this->getOption( 'media_type', '' ) ); + // filter by img_major_mime + $major_mime = str_replace( ' ', '_', $this->getOption( 'major_mime', '' ) ); + // filter by img_minor_mime + $minor_mime = str_replace( ' ', '_', $this->getOption( 'minor_mime', '' ) ); $count = 0; $dbr = $this->getDB( DB_REPLICA ); @@ -55,6 +64,18 @@ class RefreshFileHeaders extends Maintenance { $conds[] = "img_name <= {$dbr->addQuotes( $end )}"; } + if ( strlen( $media_type ) ) { + $conds[] = "img_media_type = {$dbr->addQuotes( $media_type )}"; + } + + if ( strlen( $major_mime ) ) { + $conds[] = "img_major_mime = {$dbr->addQuotes( $major_mime )}"; + } + + if ( strlen( $minor_mime ) ) { + $conds[] = "img_minor_mime = {$dbr->addQuotes( $minor_mime )}"; + } + $res = $dbr->select( 'image', '*', $conds, __METHOD__, [ 'LIMIT' => $this->mBatchSize, 'ORDER BY' => 'img_name ASC' ] ); -- 2.20.1