From ddac8ce1ce66034a1d72033a8e595167634bf073 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Thu, 3 Dec 2015 15:57:50 +0100 Subject: [PATCH] pass on timeout to execWithTimeout() --- SeedDMS_Lucene/Lucene/IndexedDocument.php | 2 +- SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SeedDMS_Lucene/Lucene/IndexedDocument.php b/SeedDMS_Lucene/Lucene/IndexedDocument.php index 8d24b3793..82e1df9b7 100644 --- a/SeedDMS_Lucene/Lucene/IndexedDocument.php +++ b/SeedDMS_Lucene/Lucene/IndexedDocument.php @@ -124,7 +124,7 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document { $mimetype = $version->getMimeType(); if(isset($_convcmd[$mimetype])) { $cmd = sprintf($_convcmd[$mimetype], $path); - $content = self::execWithTimeout($cmd); + $content = self::execWithTimeout($cmd, $timeout); /* $fp = popen($cmd, 'r'); if($fp) { diff --git a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php index 455b3dd77..3ad771513 100644 --- a/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php +++ b/SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php @@ -129,7 +129,7 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document { $mimetype = $version->getMimeType(); if(isset($_convcmd[$mimetype])) { $cmd = sprintf($_convcmd[$mimetype], $path); - $content = self::execWithTimeout($cmd); + $content = self::execWithTimeout($cmd, $timeout); if($content) { $this->addField('content', $content, 'unstored'); }