Commit graph

131 commits

Author SHA1 Message Date
umherirrender
21e0c1c533 Correct variable names in @param to match method declarations
Some @param have a typo in the variable name,
some @param's were in wrong order.

Change-Id: Ie25806831027112b398f6f4a909c59147ac3a5fa
2014-08-13 21:48:28 +02:00
rillke
c31fbf073e Unify the spelling of MIME in documentation
Writing MIME as written in Wikipedia and some documentation clean up.

Change-Id: I9dfc36d2bf55d72d9374c4075bd6d45eef0415a4
2014-08-07 23:38:45 +02:00
jenkins-bot
3d53f0acbd Merge "Avoid function calls in the loop condition of a for statement" 2014-07-24 19:51:16 +00:00
umherirrender
2c6bba5e9b Avoid function calls in the loop condition of a for statement
Change-Id: I64d9ba96797085b6f54658218404a02d4087ceaf
2014-07-24 19:45:53 +00:00
umherirrender
d15f1cc5e1 Break some long lines in maintenance, skins, tests
Change-Id: I5d86ad3e0c90e09440268a670f5af3e2bf080612
2014-07-24 19:03:17 +02:00
umherirrender
53c420e278 Fixed spacing
- use tab as indent instead of spaces
- Added space after closures "function"
- Added spaces around string_concat
- Added newline inside empty blocks
- Removed four spaces after comma

Change-Id: I4425b0c6a69b36f40acfea6511b8950cf09ce2b2
2014-07-20 21:41:41 +02:00
Sergio Santoro
2e741ad641 thumb.php: Fix undefined variable $width
Follows-up 5ca94d2d26.

In thumb.php an undefined variable ($width) was used, triggering
fatal errors while processing requests that were passing thumbnail
width with px (pixel) suffix.

Change-Id: I2dc4f4d2979f8225d2a6211ec50cdc79438539a9
2014-07-09 21:46:15 +00:00
Brian Wolff
e3bb925b9c Do thumb attempt-failures limitting via sha1 instead of name.
Otherwise if there is a broken file, and somebody fixes the file,
it could take an hour before thumbs are generated again. This
might confuse the user, and they may revert back to the broken
version thinking their fix didn't work.

Originally reported by Fae on wiki.

Change-Id: I024702391e5f7ccf10a406a29485601f64069405
2014-06-29 21:24:18 -03:00
Gergő Tisza
3ee07d8bb4 Use separate PoolCounter config for expensive thumbnails
Depends on Ic62984e0f4a761642b2bdd1bfa362301ed94c284
and If40e223c328ddd15310d13f2a49000bf6e08200e

Bug: 65691
Change-Id: Ic737673b5a31974d866b9bf5afa4b4036baa03bb
2014-06-27 19:39:47 +00:00
Faidon Liambotis
5ca94d2d26 thumb.php: support an optional "px" width suffix
A large percentage (40-50%) of the 500s that are emitted in production
are for a single URL,
https://commons.wikimedia.org/w/thumb.php?f=Crystal_Clear_action_viewmag.png&width=21px

The reason this fails is because thumb.php expects width to be "21", not
"21px", and it currently tries to fetch (and generate) the "21pxpx"
thumb size, which is obviously an invalid size. (an invalid size
shouldn't result in a 5xx but rather to a 4xx. though; that's a separate
bug that needs to be fixed).

This URL is embedded by a gadget, Gadget-searchbox-js, that is copied in
a lot of our wikis, including a big one, frwiki. mwgrep reveals that
there are a bunch of other URLs in various Gadgets that have width
values with "px" in them, so this presumably worked at some point in the
past.

While we could in theory fix all those URLs in these dozens of gadgets
across wikis to not suffix width with "px", this sounds like a herculean
effort and we're probably better off adding this compatibility branch to
thumb.php that strips the "px" suffix, if existent.

Change-Id: I3a00c9634b1c6af49fb8503cc3ff4cafdaff6b43
2014-05-11 16:58:14 +02:00
Aaron Schulz
5d286fad03 Added missing File::RENDER_NOW flag to thumb.php
Change-Id: I5f05b09272ebcad5cf8409af7ad61d9e9004a2f0
2014-05-02 16:33:14 -07:00
Aaron Schulz
a530be17cf Made wfThumbIsStandard() aware of the width/height handler scaling choice
* Generally, either the height or width is used for each description page
  link when using $wgImageLimits. This depends on the $wgImageLimits values
  and the file dimensions. Description page links should better pass the
  wfThumbIsStandard() method now, and thus have weaker rate-limiting.

Change-Id: Id1c3b0fc57f8ed3c14929a1a1661842a069b805d
2014-05-01 00:08:29 +00:00
jenkins-bot
5c2f1dc5c0 Merge "Fixed "getCachedWork" callback in thumb.php to avoid 404s in the stream method" 2014-04-30 17:44:17 +00:00
Aaron Schulz
41730cbfb9 Fixed "getCachedWork" callback in thumb.php to avoid 404s in the stream method
Change-Id: Id3781b87023291b9f7b2c7b3d8ae429a4065c227
2014-04-30 10:38:25 -07:00
Aaron Schulz
40e5324ece Moved isDeleted() check down to avoid information leakage in thumb.php
Change-Id: Idcbf79ef7c82f5bcf3c0ab1002fde2201d81313f
2014-04-30 00:51:35 -07:00
Aaron Schulz
b0de7c7c60 Tweaked wfThumbIsStandard() to recognize handler-specific default parameters
* Now thumbnails with default lossy/lossless values will still count as "standard",
  for example. This makes use of the file media handler.

Change-Id: Ia69301dfbf85bb26a17f8eee0939d690021343ec
2014-04-29 14:39:05 -07:00
Aaron Schulz
5c57d22894 Randomize thumbnail failure key TTL a bit to avoid stampedes
Change-Id: Ibf268b646a9eb2acfaa649d634c5278133091158
2014-04-25 11:33:10 -07:00
Aaron Schulz
89d85a4be4 Added pool counter support for all thumb.php requests
* This can limit how many workers work on a given file at once,
  regardless of which specific thumbnail parameters are requested.
* Also added a BagOStuff::incrWithInit() method per DRY.
* Tweaked the register_shutdown_function() callback to avoid
  File/MediaTransformOutput references, since they may involve
  TempFSFile objects.

Change-Id: Ic01461cb974ab23b179ac3b60cf6de12e36360f6
2014-04-23 20:57:17 +00:00
Aaron Schulz
c993ec0095 Avoid uncommitted transaction notices in thumb.php and img_auth.php
bug: 56269
Change-Id: I8cf5c070899d281c7efbac853f04c2fea9374e4d
2014-04-22 15:40:42 +00:00
Aaron Schulz
c81e91d4fe Lowered limit for wfThumbIsAttemptThrottled() to 4
Change-Id: I2d91647abdaff820eb87b0bd45505ffa1fbc25fe
2014-04-21 11:19:52 -07:00
jenkins-bot
41f9342538 Merge "thumb.php and img_auth.php cleanups" 2014-04-21 17:50:32 +00:00
jenkins-bot
b26e232708 Merge "Call wfThumbIncrAttemptFailures() in thumb.php on fatals" 2014-04-21 16:34:29 +00:00
Aaron Schulz
3e7cdbf63a Call wfThumbIncrAttemptFailures() in thumb.php on fatals
Change-Id: I3dbe07d12abdc265d377cd05bb87c837df156995
2014-04-21 09:27:04 -07:00
Aaron Schulz
0f9d78eb07 thumb.php and img_auth.php cleanups
* Specifically check isDeleted() instead of relying on the file
  being moved to the deleted zone alone.
* Made img_auth.php skip some unnecessary checks for public wikis.
  Also made it set the private cache control headers only if needed.

Change-Id: If82589acd53c02943d5f3bbafd29381fd63f8f68
2014-04-20 17:11:33 -07:00
Aaron Schulz
4f2324fc81 Support tighter rate limiting for "non-standard" thumbnails
* Also avoid passing some junk params to File::thumbName()

Change-Id: I7e89f72ade47be7fcc7bf33f0afb970183aac936
2014-04-17 10:39:09 -07:00
umherirrender
9c614ac02d Fixed some @params documentation
Swapped some "$var type" to "type $var" or added missing types
before the $var. Changed some other types to match the more common
spelling. Makes beginning of some text in captial.

Change-Id: I8c9f30128b46086064326708a4878228ba459447
2014-04-14 19:52:18 +00:00
Gilles Dubuc
4d9e07056e Have ?download parameter trigger Content-Disposition: attachment
This parameter triggers Content-Disposition: Attachment which
makes the browser download the image instead of displaying it.

This is needed by Media Viewer to allow users to click a button in
order to download an image at a given resolution or the original.

Change-Id: I470a24a09139ac65588312104995e34d97a89b0f
2014-03-25 11:04:50 +01:00
Aaron Schulz
dc496c02d9 Limit attempts to render the same thumbnail after failures
bug: 49118
Change-Id: I9379ec445bf2e77bd3b085c00182c5e406ed300d
2014-02-12 16:55:57 -07:00
umherirrender
5dbfd5bf80 Fixed spacing
- Removed trailing spaces in comments
- Removed multiple empty lines
- Removed space after object operator

Change-Id: I9fd3256ab490c7cd2034de3fd94e6be6e6d6d8f2
2013-11-21 18:52:25 +00:00
Tim Starling
0dd1a446c8 thumb.php: map b/c params prior to attempting redirection
This should fix most of the "No width specified" exceptions. I guess
most of this code will be rewritten to fix bug 56926, superseding this
patch, but I thought this might be a useful stopgap.

Bug: 56924
Change-Id: I5bcaaafc81e1e2a8a33819fa64790d5509dc6aa6
2013-11-12 14:57:22 +11:00
jenkins-bot
1e95602281 Merge "Support rate-limiting thumbnail generation" 2013-10-16 17:31:50 +00:00
Reedy
f7e7a5ef9a Fix "Unsupported operand types at thumb.php on line 429"
Return type of $handler->parseParamString() wasn't evaluated,
instead $handler value was compared again

Bug: 55437
Change-Id: Iedb940d9f1ad4d137b9732e7e624e55d05bc2c96
2013-10-07 19:46:02 +01:00
Aaron Schulz
43d3304ed6 Support rate-limiting thumbnail generation
* Added some rate limit comments

Change-Id: I987bb5d0ed8821d64131baefd4457acd25678818
2013-10-04 15:51:55 -07:00
jenkins-bot
265cb52243 Merge "Make thumb_handler.php use MediaHandler::parseParamString" 2013-09-30 18:11:09 +00:00
Brian Wolff
aa99e1cdfc Add a header on thumb.php saying which thumb server on error.
Only added if $wgShowHostnames is on. Adding the host name as a
header makes it much easier when debugging with command line tools,
since one often throws away the response body. This still keeps
the host name in an html comment in the response body as well,
like it was previously.

Change-Id: I9d15bd5e2abb4e7a8d3fe2a17fc546a1c5f3b70f
2013-09-28 20:41:00 -03:00
Brian Wolff
ccf89be91a Make thumb_handler.php use MediaHandler::parseParamString
Use MediaHandler::parseParamString to parse the parameter string
of a thumbnail. This seems to make much more sense given the
design of the Handler class. Also mark ExtractThumbParameters hook
as deprecated.

This should be reviewed by someone familar with the 404 thumbnailing
infrastructure. I'm unclear if there was a reason for why it wasn't
using MediaHandler::parseParamString in the first place.

Bug: 49629
Change-Id: I43a0e7d6f0e45536e4e24b72140157791f5f027f
2013-09-28 20:32:40 -03:00
Aaron Schulz
7e9f8ec1df Simplified some code and broke lines in thumb.php
Change-Id: I99fc63ab473a3f2fe33e0227e5e283e0c195f01b
2013-09-20 18:10:31 +00:00
Brian Wolff
82a8e07935 Make thumb.php give http redirects if given a file redirect
See bug 22390 for some of the background. Basically there's two
reasons why we want this:
* Hotlinkers to commons. We don't want to break their links when
we move a file (Wikimedia blog is a prominent hotlinker)
* Cached entires. On wikis using commons files, a file move doesn't
trigger HTMLCacheUpdate jobs for the downstream wiki (it only
triggers it on commons). This means that these pages will still
use the old version of the html (with img tags that have the old
url) until the next edit or purge action. But these urls won't
work as soon as the file is moved.

I'm pretty confident that redirects will work at this point
in the thumb stack, as the redirects for long file names work
fine (provided no thumb exists in swift with the wrong name).

Change-Id: I40350121cf902f66fcbd3cf788335a988fa7ee33
2013-08-27 09:22:05 -06:00
Aaron Schulz
555664ac63 Simplified some tedious profiling code
Change-Id: Ia5d56b3a38feb1b151f6821d76abbdd6b2dd9f46
2013-08-22 11:18:19 -07:00
Brian Wolff
377f8ffa07 thumb_handler.php doesn't seem to extract path_info correctly
Set $wgArticlePath so that it works the way that [[Manual:Thumb.php]]
claims it does.

Change-Id: I35b4ab73e1d84dad10503d3a098ee154e8d58d8a
2013-06-16 22:43:13 -03:00
Timo Tijhof
4bd5471ca3 docs: Remove odd colons after @todo
Most were this way already:
https://doc.wikimedia.org/mediawiki-core/master/php/html/todo.html

Ran a find/replace on the odd ones. Also made them all
lower case.

Change-Id: I70c6a69344ddebc603e9a1c1d87e3cc4f4f4c560
2013-05-15 06:23:40 +00:00
Timo Tijhof
50e7985d4d phpcs: Fix WhiteSpace.LanguageConstructSpacing warnings
Squiz.WhiteSpace.LanguageConstructSpacing:
   Language constructs must be followed by a single space;
   expected "require_once expression" but found
   "require_once(expression)"

It is a keyword (e.g. like `new`, `return` and `print`). As
such the parentheses don't make sense.

Per our code conventions, we use a space after keywords like
these. We appeared to have an unwritten exception for `require`
that doesn't make sense. About 60% of require/include usage
was missing the space and/or had superfluous parentheses.

It is as silly as print("foo") or return("foo"), it works
because keywords have no significance for whitespace between
it and the expression that follows, and since experessions can
be wrapped in parentheses for clarity (e.g. when doing string
concatenation or mathematical operations) the parenthesis
before and after basiclaly just ignored.

Change-Id: I2df2f80b8123714bea7e0771bf94b51ad5bb4b87
2013-05-09 05:56:26 +02:00
Tim Starling
1fe9340bb3 Remove hphpc support and deprecate related functions
hphpc has been superseded by hhvm, so support for hphpc is no longer
needed.

* Continue to use Preprocessor_Hash under HipHop since it is still
  faster under hhvm
* Keep $wgCompiledFiles for now, so that wikihiero doesn't give an error
  before Ic9d1e795 is merged
* Migrate the run-server script and associated configuration file to
  hhvm. Enable EnableStaticContentFromDisk since it doesn't seem
  ridiculously inefficient at first glance. Run from $IP rather than
  $IP/.. since hhvm is apparently not picky about sourcing files from
  outside of the current directory.

Change-Id: Ic3e769f1fbad4f7ad26dd819406796fee48c6b45
2013-05-09 08:28:05 +10:00
Siebrand Mazeland
655f5c6b48 Update code formatting
Change-Id: I8741b5b979e55f38a666961a16c387586a92410e
2013-02-14 13:38:19 +00:00
Aaron Schulz
a04d9cb748 Improved some thumb.php error messages.
Change-Id: I5a61e898dd97db67b719a13ca044530c4baecc99
2013-01-23 11:11:44 -08:00
Aaron Schulz
dfe02f371b (bug 42302) Fixed broken thumbnails for files with a "+" in the name.
Change-Id: Ic5764fa17e12d24ddbc77bfc0523e97ed12b0afe
2012-11-24 15:47:22 -08:00
Aaron Schulz
3fca064bfc Fixed uncaught thumbName() exceptions and use $_GET.
* Using $_REQUEST is bad since cookie data is also in there.
* Also made a few tiny code cleanups.

Change-Id: Ib7064b95a2788484d05cf457034fe1d5be298bc4
2012-11-15 17:19:08 -08:00
Aaron Schulz
c43deebfd5 Simplified thumb.php for 404 handling.
* Made thumb_handler.php "just work" in a way similar to img_auth.
  It no longer needs any "handlerUrl" setting to be set.

Change-Id: I557ba1f94db3cef0f21f5c0e2b60d8e381ea3f96
2012-11-08 17:31:05 +11:00
Aaron Schulz
3338587604 [FileRepo] Allow different file URLs for media based on file extension.
Change-Id: Ib647377312c93c8ed046f7b9510d0e656788cdc3
2012-11-08 06:19:39 +00:00
Jan Gerber
02624d0016 Allow ExtractThumbParameters before local regexp
ExtractThumbParameters might be able to extract more params but still
match the local regexp. To be able to extract all params, check
ExtractThumbParameters first and only fallback to regexp.

Change-Id: I26efdec1af5fb2bd5e3cc503f36692d12668b2e2
2012-11-02 08:47:32 +00:00