diff options
| author | Antoine Musso <hashar@free.fr> | 2017-04-14 16:51:27 +0200 |
|---|---|---|
| committer | Krinkle <krinklemail@gmail.com> | 2017-04-15 03:22:33 +0000 |
| commit | c5d736bcad9af765e51e1bd44746e9483d4dbd75 (patch) | |
| tree | e5801408f5829781804605f59f984ba470d11da5 /includes | |
| parent | 7dfe22b45e5568b289c7622d79a2220d2dbe2dfa (diff) | |
| download | mediawikicore-c5d736bcad9af765e51e1bd44746e9483d4dbd75.tar.gz mediawikicore-c5d736bcad9af765e51e1bd44746e9483d4dbd75.zip | |
media: Capture stderr when running 'convert --version'
At Wikimedia, $wgImageMagickConvertCommand points to a shell wrapper
that invokes ImageMagick convert with:
firejail --profile=/etc/firejail/mediawiki-converters.profile
firejail emits to stderr an information message:
Reading profile /etc/firejail/mediawiki-converters.profile
That ends up in HHVM stderr and is populated up to logstash as an error.
MediaWiki does check imagemagick version by running `convert -version`,
switch from wfShellExec() to wfShellExecWithStderr().
Bug: T158649
Change-Id: I78d1ef59533c605f59b42e10556bb595d6c2cc15
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/media/TransformationalImageHandler.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/media/TransformationalImageHandler.php b/includes/media/TransformationalImageHandler.php index 1ab0f369dbd8..2a74e0d7084b 100644 --- a/includes/media/TransformationalImageHandler.php +++ b/includes/media/TransformationalImageHandler.php @@ -521,7 +521,7 @@ abstract class TransformationalImageHandler extends ImageHandler { $cmd = wfEscapeShellArg( $wgImageMagickConvertCommand ) . ' -version'; wfDebug( $method . ": Running convert -version\n" ); $retval = ''; - $return = wfShellExec( $cmd, $retval ); + $return = wfShellExecWithStderr( $cmd, $retval ); $x = preg_match( '/Version: ImageMagick ([0-9]*\.[0-9]*\.[0-9]*)/', $return, $matches ); |