From: Antoine Musso <hashar@free.fr>
Date: Fri, 14 Apr 2017 14:51:27 +0000 (+0200)
Subject: media: Capture stderr when running 'convert --version'
X-Git-Tag: 1.31.0-rc.0~3503
X-Git-Url: http://git.cyclocoop.org/%22.%28%24lien.?a=commitdiff_plain;h=c5d736bcad9af765e51e1bd44746e9483d4dbd75;p=lhc%2Fweb%2Fwiklou.git

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
---

diff --git a/includes/media/TransformationalImageHandler.php b/includes/media/TransformationalImageHandler.php
index 1ab0f369db..2a74e0d708 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
 				);