Jordi Boggiano 14 лет назад
Родитель
Сommit
8ba76fe6d2
3 измененных файлов с 3 добавлено и 3 удалено
  1. 1 1
      doc/04-schema.md
  2. 1 1
      src/Composer/Factory.php
  3. 1 1
      src/Composer/Util/ProcessExecutor.php

+ 1 - 1
doc/04-schema.md

@@ -321,7 +321,7 @@ The following options are supported:
   different directory if you want to.
   different directory if you want to.
 * **bin-dir:** Defaults to `vendor/bin`. If a project includes binaries, they
 * **bin-dir:** Defaults to `vendor/bin`. If a project includes binaries, they
   will be symlinked into this directory.
   will be symlinked into this directory.
-* **process-timeout:** Defaults to `60`. The duration processes like git clones
+* **process-timeout:** Defaults to `300`. The duration processes like git clones
   can run before Composer assumes they died out. You may need to make this
   can run before Composer assumes they died out. You may need to make this
   higher if you have a slow connection or huge vendors.
   higher if you have a slow connection or huge vendors.
 
 

+ 1 - 1
src/Composer/Factory.php

@@ -52,7 +52,7 @@ class Factory
         // Configuration defaults
         // Configuration defaults
         $composerConfig = array(
         $composerConfig = array(
             'vendor-dir' => 'vendor',
             'vendor-dir' => 'vendor',
-            'process-timeout' => 60,
+            'process-timeout' => 300,
         );
         );
 
 
         $packageConfig = $file->read();
         $packageConfig = $file->read();

+ 1 - 1
src/Composer/Util/ProcessExecutor.php

@@ -19,7 +19,7 @@ use Symfony\Component\Process\Process;
  */
  */
 class ProcessExecutor
 class ProcessExecutor
 {
 {
-    static protected $timeout = 60;
+    static protected $timeout = 300;
 
 
     /**
     /**
      * runs a process on the commandline
      * runs a process on the commandline