Fix for r103502: make PoolWorkArticleView::doWork() return true when the parse is...

[lhc/web/wiklou.git] / thumb.config.sample

diff --git a/thumb.config.sample b/thumb.config.sample
index 927302a..84445c1 100644 (file)
--- a/thumb.config.sample
+++ b/thumb.config.sample
@@ -14,29 +14,36 @@ if ( !defined( 'THUMB_HANDLER' ) ) {
  * 1) Copy this file to thumb.config.php and modify the settings.
  * 2) The webserver must be setup to have thumb-handler.php as a 404 handler.
  *    This can be done in apache by editing .htaccess in the /thumb directory by adding:
- *       ErrorDocument 404 /path/to/thumb-handler.php
+ *    <IfModule rewrite_module>
+ *          RewriteEngine on
+ *          RewriteCond %{REQUEST_FILENAME} !-f
+ *          RewriteCond %{REQUEST_FILENAME} !-d
+ *          RewriteRule ^([^/]+/)?[0-9a-f]/[0-9a-f][0-9a-f]/[^/]+/[^/]+$ /path/to/thumb_handler.php [L]
+ *    </IfModule>
  */
 
-# URL name of the server (e.g. "upload.wikipedia.org").
-$thgThumbServer = "http://localhost";
-# URL fragment after the server name to the thumb directory
-$thgThumbFragment = "MW_trunk/images/thumb";
-# URL regex fragment correspond to the directory hashing of thumbnails.
-# This must correspond to $wgLocalFileRepo['hashLevels'].
-$thgThumbHashFragment = '[0-9a-f]/[0-9a-f][0-9a-f]/'; // 2-level directory hashing
+$thgThumbUrlMatch = array(
+       # URL name of the server (e.g. "upload.wikipedia.org").
+       'server'        => 'http://localhost',
+       # URL fragment to the thumb/ directory
+       'dirFragment'   => 'MW_trunk/images/thumb',
+       # URL regex fragment correspond to the directory hashing of thumbnails.
+       # This must correspond to $wgLocalFileRepo['hashLevels'].
+       'hashFragment'  => '[0-9a-f]/[0-9a-f][0-9a-f]/' // 2-level directory hashing
+);
 
-# The URL to thumb.php, accessible from the web server.
-$thgThumbScriptPath = "http://localhost/MW_trunk/thumb.php";
-
-# Timeout to use for cURL request to thumb.php.
-# Leave it long enough to generate a ulimit timeout in ordinary
-# cases, but short enough to avoid a local PHP timeout.
-$thgThumbCurlTimeout = 53;
-# Optional proxy server to use to access thumb.php
-$thgThumbCurlProxy = null; // proxy to thumb.php
-
-# File path to a php file the gives a 404 error message
-$thgThumb404File = null;
+$thgThumbCurlConfig = array(
+       # Optionally cURL to thumb.php instead of using it directly
+       'enabled' => false,
+       # The URL to thumb.php, accessible from the web server.
+       'url'     => 'http://localhost/MW_trunk/thumb.php',
+       # Optional proxy server to use to access thumb.php
+       'proxy'   => null,
+       # Timeout to use for cURL request to thumb.php.
+       # Leave it long enough to generate a ulimit timeout in ordinary
+       # cases, but short enough to avoid a local PHP timeout.
+       'timeout' => 53
+);
 
 # Custom functions for overriding aspects of thumb handling
 $thgThumbCallbacks = array();