diff options
author | Urban Müller | 2011-09-19 14:30:35 +0000 |
---|---|---|
committer | Urban Müller | 2011-09-19 14:30:35 +0000 |
commit | 72096b370faba31a14097d45d45cd0b7414d55dc (patch) | |
tree | 02d8ef44bfee8cf52f8f3a69b04d1ab5bf2bee33 | |
parent | 874bf803764e83a6b40d20e9c1d63f30573be8da (diff) | |
download | itools-72096b370faba31a14097d45d45cd0b7414d55dc.tar.gz itools-72096b370faba31a14097d45d45cd0b7414d55dc.tar.bz2 itools-72096b370faba31a14097d45d45cd0b7414d55dc.zip |
protect against hanging gm
-rw-r--r-- | it.class | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -564,7 +564,7 @@ static function imageconvert($p) $p['-opts'] = array('-thumbnail' => $p['size']) + (array)$p['-opts']; if (in_array($type, explode(',', $p['types']))) # Valid type? - $cmdoutput = it::exec('gm convert 2>&1 -flatten -quality 75 {-opts} {in} {type}:{out} || echo "SHELL ERROR $?"', $p); + $cmdoutput = it::exec('ultratimeout 600 gm convert 2>&1 -flatten -quality 75 {-opts} {in} {type}:{out} || echo "SHELL ERROR $?"', $p); return $cmdoutput === ""; } |