From eadc6b05d683af1eeaef6bdcf018b77ab521b9ab Mon Sep 17 00:00:00 2001 From: Gilles Dubuc Date: Tue, 28 Jul 2015 17:21:17 +0200 Subject: [PATCH] Don't retry invalid thumbnail requests due to impossible width At the moment this isn't going to work in production, because varnish turns 400s into 500s. But I'll try to fix that separately. Bug: T106740 Change-Id: Id156ee4ac986ad2a6d7e49dfe8aa7577764eca11 --- includes/jobqueue/jobs/ThumbnailRenderJob.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/includes/jobqueue/jobs/ThumbnailRenderJob.php b/includes/jobqueue/jobs/ThumbnailRenderJob.php index d1d9999ad8..f558c4887b 100644 --- a/includes/jobqueue/jobs/ThumbnailRenderJob.php +++ b/includes/jobqueue/jobs/ThumbnailRenderJob.php @@ -55,11 +55,10 @@ class ThumbnailRenderJob extends Job { wfDebug( __METHOD__ . ": received status {$status}\n" ); - if ( $status === 200 || $status === 301 || $status === 302 ) { + // 400 happens when requesting a size greater or equal than the original + if ( $status === 200 || $status === 301 || $status === 302 || $status === 400 ) { return true; } elseif ( $status ) { - // Note that this currently happens (500) when requesting sizes larger then or - // equal to the original, which is harmless. $this->setLastError( __METHOD__ . ': incorrect HTTP status ' . $status . ' when hitting ' . $thumbUrl ); return false; } else { -- 2.20.1