Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Reduced some instances of HTTP 500 in thumb.php"

Browse source
This commit is contained in:
jenkins-bot 2015-08-26 20:07:29 +00:00 committed by Gerrit Code Review
commit 859d6bf2bc
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
thumb.php
View file

@ -221,7 +221,7 @@ function wfStreamThumb( array $params ) {
wfThumbErrorText( 404, "The source file '$fileName' does not exist." ); wfThumbErrorText( 404, "The source file '$fileName' does not exist." );
return; return;
} elseif ( $img->getPath() === false ) { } elseif ( $img->getPath() === false ) {
wfThumbErrorText( 500, "The source file '$fileName' is not locally accessible." ); wfThumbErrorText( 400, "The source file '$fileName' is not locally accessible." );
return; return;
} }
@ -316,10 +316,10 @@ function wfStreamThumb( array $params ) {
$user = RequestContext::getMain()->getUser(); $user = RequestContext::getMain()->getUser();
if ( !wfThumbIsStandard( $img, $params ) && $user->pingLimiter( 'renderfile-nonstandard' ) ) { if ( !wfThumbIsStandard( $img, $params ) && $user->pingLimiter( 'renderfile-nonstandard' ) ) {
wfThumbError( 500, wfMessage( 'actionthrottledtext' )->parse() ); wfThumbError( 429, wfMessage( 'actionthrottledtext' )->parse() );
return; return;
} elseif ( $user->pingLimiter( 'renderfile' ) ) { } elseif ( $user->pingLimiter( 'renderfile' ) ) {
wfThumbError( 500, wfMessage( 'actionthrottledtext' )->parse() ); wfThumbError( 429, wfMessage( 'actionthrottledtext' )->parse() );
return; return;
} }
@ -555,7 +555,7 @@ function wfExtractThumbParams( $file, $params ) {
* @return void * @return void
*/ */
function wfThumbErrorText( $status, $msgText ) { function wfThumbErrorText( $status, $msgText ) {
return wfThumbError( $status, htmlspecialchars( $msgText ) ); wfThumbError( $status, htmlspecialchars( $msgText ) );
} }
/** /**
@ -570,10 +570,8 @@ function wfThumbError( $status, $msgHtml ) {
header( 'Cache-Control: no-cache' ); header( 'Cache-Control: no-cache' );
header( 'Content-Type: text/html; charset=utf-8' ); header( 'Content-Type: text/html; charset=utf-8' );
if ( $status == 400 ) { if ( $status == 400 || $status == 404 || $status == 429 ) {
HttpStatus::header( 400 ); HttpStatus::header( $status );
} elseif ( $status == 404 ) {
HttpStatus::header( 404 );
} elseif ( $status == 403 ) { } elseif ( $status == 403 ) {
HttpStatus::header( 403 ); HttpStatus::header( 403 );
header( 'Vary: Cookie' ); header( 'Vary: Cookie' );