}
wfLogProfilingData();
+// Commit and close up!
+$factory = wfGetLBFactory();
+$factory->commitMasterChanges();
+$factory->shutdown();
//--------------------------------------------------------------------------
$varyHeader[] = 'Cookie';
}
+ // Check if the file is hidden
+ if ( $img->isDeleted( File::DELETED_FILE ) ) {
+ wfThumbError( 404, "The source file '$fileName' does not exist." );
+ return;
+ }
+
// Do rendering parameters extraction from thumbnail name.
if ( isset( $params['thumbName'] ) ) {
$params = wfExtractThumbParams( $img, $params );
}
}
+ $rel404 = isset( $params['rel404'] ) ? $params['rel404'] : null;
unset( $params['r'] ); // ignore 'r' because we unconditionally pass File::RENDER
unset( $params['f'] ); // We're done with 'f' parameter.
+ unset( $params['rel404'] ); // moved to $rel404
// Get the normalized thumbnail name from the parameters...
try {
// for the thumb params and the parent directory for the source file name.
// Check that the zone relative path matches up so squid caches won't pick
// up thumbs that would not be purged on source file deletion (bug 34231).
- if ( isset( $params['rel404'] ) ) { // thumbnail was handled via 404
- if ( rawurldecode( $params['rel404'] ) === $img->getThumbRel( $thumbName ) ) {
+ if ( $rel404 !== null ) { // thumbnail was handled via 404
+ if ( rawurldecode( $rel404 ) === $img->getThumbRel( $thumbName ) ) {
// Request for the canonical thumbnail name
- } elseif ( rawurldecode( $params['rel404'] ) === $img->getThumbRel( $thumbName2 ) ) {
+ } 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 ) );
} else {
wfThumbError( 404, "The given path of the specified thumbnail is incorrect;
expected '" . $img->getThumbRel( $thumbName ) . "' but got '" .
- rawurldecode( $params['rel404'] ) . "'." );
+ rawurldecode( $rel404 ) . "'." );
return;
}
}
}
$user = RequestContext::getMain()->getUser();
- if ( $user->pingLimiter( 'renderfile' ) ) {
+ if ( !wfThumbIsStandard( $img, $params ) && $user->pingLimiter( 'renderfile-nonstandard' ) ) {
wfThumbError( 500, wfMessage( 'actionthrottledtext' ) );
return;
- } elseif ( wfThumbIsAttemptThrottled( $img, $thumbName, 5 ) ) {
- wfThumbError( 500, wfMessage( 'thumbnail_image-failure-limit', 5 ) );
+ } elseif ( $user->pingLimiter( 'renderfile' ) ) {
+ wfThumbError( 500, wfMessage( 'actionthrottledtext' ) );
return;
}
- // Thumbnail isn't already there, so create the new thumbnail...
- try {
- $thumb = $img->transform( $params, File::RENDER_NOW );
- } catch ( Exception $ex ) {
- // Tried to select a page on a non-paged file?
- $thumb = false;
- }
+ // Actually generate a new thumbnail
+ list( $thumb, $errorMsg ) = wfGenerateThumbnail( $img, $params, $thumbName, $thumbPath );
// Check for thumbnail generation errors...
- $errorMsg = false;
$msg = wfMessage( 'thumbnail_error' );
if ( !$thumb ) {
- $errorMsg = $msg->rawParams( 'File::transform() returned false' )->escaped();
+ $errorMsg = $errorMsg ?: $msg->rawParams( 'File::transform() returned false' )->escaped();
} elseif ( $thumb->isError() ) {
$errorMsg = $thumb->getHtmlMsg();
} elseif ( !$thumb->hasFile() ) {
}
if ( $errorMsg !== false ) {
- wfThumbIncrAttemptFailures( $img, $thumbName );
wfThumbError( 500, $errorMsg );
} else {
// Stream the file if there were no errors
}
/**
- * @param File $img
+ * Actually try to generate a new thumbnail
+ *
+ * @param File $file
+ * @param array $params
* @param string $thumbName
- * @param int $limit
- * @return int|bool
+ * @param string $thumbPath
+ * @return array (MediaTransformOutput|bool, string|bool error message HTML)
*/
-function wfThumbIsAttemptThrottled( File $img, $thumbName, $limit ) {
- global $wgMemc;
+function wfGenerateThumbnail( File $file, array $params, $thumbName, $thumbPath ) {
+ global $wgMemc, $wgAttemptFailureEpoch;
- return ( $wgMemc->get( wfThumbAttemptKey( $img, $thumbName ) ) >= $limit );
-}
+ $key = wfMemcKey( 'attempt-failures', $wgAttemptFailureEpoch,
+ $file->getRepo()->getName(), md5( $file->getName() ), md5( $thumbName ) );
-/**
- * @param File $img
- * @param string $thumbName
- */
-function wfThumbIncrAttemptFailures( File $img, $thumbName ) {
- global $wgMemc;
+ // Check if this file keeps failing to render
+ if ( $wgMemc->get( $key ) >= 4 ) {
+ return array( false, wfMessage( 'thumbnail_image-failure-limit', 4 ) );
+ }
+
+ $done = false;
+ // Record failures on PHP fatals in addition to caching exceptions
+ register_shutdown_function( function() use ( &$done, $key ) {
+ if ( !$done ) { // transform() gave a fatal
+ global $wgMemc;
+ // Randomize TTL to reduce stampedes
+ $wgMemc->incrWithInit( $key, 3600 + mt_rand( 0, 300 ) );
+ }
+ } );
- $key = wfThumbAttemptKey( $img, $thumbName );
- if ( !$wgMemc->incr( $key, 1 ) ) {
- if ( !$wgMemc->add( $key, 1, 3600 ) ) {
- $wgMemc->incr( $key, 1 );
+ $thumb = false;
+ $errorHtml = false;
+
+ // Thumbnail isn't already there, so create the new thumbnail...
+ try {
+ $work = new PoolCounterWorkViaCallback( 'FileRender', sha1( $file->getName() ),
+ array(
+ 'doWork' => function() use ( $file, $params ) {
+ return $file->transform( $params, File::RENDER_NOW );
+ },
+ 'getCachedWork' => function() use ( $file, $params, $thumbPath ) {
+ // If the worker that finished made this thumbnail then use it.
+ // Otherwise, it probably made a different thumbnail for this file.
+ return $file->getRepo()->fileExists( $thumbPath )
+ ? $file->transform( $params, File::RENDER_NOW )
+ : false; // retry once more in exclusive mode
+ },
+ 'fallback' => function() {
+ return wfMessage( 'generic-pool-error' )->parse();
+ },
+ 'error' => function ( $status ) {
+ return $status->getHTML();
+ }
+ )
+ );
+ $result = $work->execute();
+ if ( $result instanceof MediaTransformOutput ) {
+ $thumb = $result;
+ } elseif ( is_string( $result ) ) { // error
+ $errorHtml = $result;
}
+ } catch ( Exception $e ) {
+ // Tried to select a page on a non-paged file?
+ }
+
+ $done = true; // no PHP fatal occured
+
+ if ( !$thumb || $thumb->isError() ) {
+ // Randomize TTL to reduce stampedes
+ $wgMemc->incrWithInit( $key, 3600 + mt_rand( 0, 300 ) );
}
+
+ return array( $thumb, $errorHtml );
}
/**
- * @param File $img
- * @param string $thumbName
- * @return string
+ * Returns true if this thumbnail is one that MediaWiki generates
+ * links to on file description pages and possibly parser output.
+ *
+ * $params is considered non-standard if they involve a non-standard
+ * width or any non-default parameters aside from width and page number.
+ * The number of possible files with standard parameters is far less than
+ * that of all combinations; rate-limiting for them can thus be more generious.
+ *
+ * @param File $file
+ * @param array $params
+ * @return bool
*/
-function wfThumbAttemptKey( File $img, $thumbName ) {
- global $wgAttemptFailureEpoch;
+function wfThumbIsStandard( File $file, array $params ) {
+ global $wgThumbLimits, $wgImageLimits;
+
+ $handler = $file->getHandler();
+ if ( !$handler || !isset( $params['width'] ) ) {
+ return false;
+ }
+
+ $basicParams = array();
+ if ( isset( $params['page'] ) ) {
+ $basicParams['page'] = $params['page'];
+ }
+
+ // Check if the width matches one of $wgThumbLimits
+ if ( in_array( $params['width'], $wgThumbLimits ) ) {
+ $normalParams = $basicParams + array( 'width' => $params['width'] );
+ // Append any default values to the map (e.g. "lossy", "lossless", ...)
+ $handler->normaliseParams( $file, $normalParams );
+ } else {
+ // If not, then check if the width matchs one of $wgImageLimits
+ $match = false;
+ foreach ( $wgImageLimits as $pair ) {
+ $normalParams = $basicParams + array( 'width' => $pair[0], 'height' => $pair[1] );
+ // Decide whether the thumbnail should be scaled on width or height.
+ // Also append any default values to the map (e.g. "lossy", "lossless", ...)
+ $handler->normaliseParams( $file, $normalParams );
+ // Check if this standard thumbnail size maps to the given width
+ if ( $normalParams['width'] == $params['width'] ) {
+ $match = true;
+ break;
+ }
+ }
+ if ( !$match ) {
+ return false; // not standard for description pages
+ }
+ }
+
+ // Check that the given values for non-page, non-width, params are just defaults
+ foreach ( $params as $key => $value ) {
+ if ( !isset( $normalParams[$key] ) || $normalParams[$key] != $value ) {
+ return false;
+ }
+ }
- return wfMemcKey( 'attempt-failures', $wgAttemptFailureEpoch,
- $img->getRepo()->getName(), md5( $img->getName() ), md5( $thumbName ) );
+ return true;
}
/**
dépôts / lhc / web / wiklou.git / blobdiff