From 72096b370faba31a14097d45d45cd0b7414d55dc Mon Sep 17 00:00:00 2001
From: Urban Müller
Date: Mon, 19 Sep 2011 14:30:35 +0000
Subject: protect against hanging gm

---
 it.class | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'it.class')

diff --git a/it.class b/it.class
index 262b295..82d01cc 100644
--- a/it.class
+++ b/it.class
@@ -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 === "";
 }
-- 
cgit v1.2.3