aboutsummaryrefslogtreecommitdiffstats
path: root/library
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-05-03 21:49:52 -0400
committerAndrew Manning <tamanning@zoho.com>2016-05-03 21:49:52 -0400
commit5686ee13b4540bfc0ce6c40f07b6e43c3c55e9a8 (patch)
treee1dd289cf5ddcf514e5951872f5148b65422e32a /library
parent2db86b950e78cb01cde659f424c9c01f79edc7a4 (diff)
downloadvolse-hubzilla-5686ee13b4540bfc0ce6c40f07b6e43c3c55e9a8.tar.gz
volse-hubzilla-5686ee13b4540bfc0ce6c40f07b6e43c3c55e9a8.tar.bz2
volse-hubzilla-5686ee13b4540bfc0ce6c40f07b6e43c3c55e9a8.zip
Increased PHPGit timeout to 120 seconds for large repos. Retrieve Readme.md and render on plugins page.
Diffstat (limited to 'library')
-rw-r--r--library/symfony/process/PhpProcess.php2
-rw-r--r--library/symfony/process/Process.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/library/symfony/process/PhpProcess.php b/library/symfony/process/PhpProcess.php
index 4a2a2625f..8333412f4 100644
--- a/library/symfony/process/PhpProcess.php
+++ b/library/symfony/process/PhpProcess.php
@@ -33,7 +33,7 @@ class PhpProcess extends Process
* @param int $timeout The timeout in seconds
* @param array $options An array of options for proc_open
*/
- public function __construct($script, $cwd = null, array $env = null, $timeout = 60, array $options = array())
+ public function __construct($script, $cwd = null, array $env = null, $timeout = 120, array $options = array())
{
$executableFinder = new PhpExecutableFinder();
if (false === $php = $executableFinder->find()) {
diff --git a/library/symfony/process/Process.php b/library/symfony/process/Process.php
index c1e732170..003b6b7e5 100644
--- a/library/symfony/process/Process.php
+++ b/library/symfony/process/Process.php
@@ -138,7 +138,7 @@ class Process
*
* @throws RuntimeException When proc_open is not installed
*/
- public function __construct($commandline, $cwd = null, array $env = null, $input = null, $timeout = 60, array $options = array())
+ public function __construct($commandline, $cwd = null, array $env = null, $input = null, $timeout = 120, array $options = array())
{
if (!function_exists('proc_open')) {
throw new RuntimeException('The Process class relies on proc_open, which is not available on your PHP installation.');