Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Only use limit.sh if /bin/bash executable, instead of if linux."

Browse source
This commit is contained in:
jenkins-bot 2014-06-25 21:53:56 +00:00 committed by Gerrit Code Review
commit add089c254
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/GlobalFunctions.php
View file

@ -2873,7 +2873,7 @@ function wfShellExec( $cmd, &$retval = null, $environ = array(),
$cmd = $envcmd . $cmd;
$useLogPipe = false;
if ( php_uname( 's' ) == 'Linux' ) {
if ( is_executable( '/bin/bash' ) ) {
$time = intval ( isset( $limits['time'] ) ? $limits['time'] : $wgMaxShellTime );
if ( isset( $limits['walltime'] ) ) {
$wallTime = intval( $limits['walltime'] );