public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Fix re-entrant behavior

pull/308/head
Jordi Boggiano 2012-02-17 11:53:09 +01:00
parent db03b7bbbd
commit 844c43092f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Composer/Util/RemoteFilesystem.php
View File

@ -74,12 +74,13 @@ class RemoteFilesystem
* @param string $fileUrl The file URL * @param string $fileUrl The file URL
* @param string $fileName the local filename * @param string $fileName the local filename
* @param boolean $progess Display the progression * @param boolean $progess Display the progression
* @param boolean $firstCall Whether this is the first attempt at fetching this resource
* *
* @throws \RuntimeException When the file could not be downloaded * @throws \RuntimeException When the file could not be downloaded
*/ */
protected function get($originUrl, $fileUrl, $fileName = null, $progess = true) protected function get($originUrl, $fileUrl, $fileName = null, $progess = true, $firstCall = true)
{ {
$this->firstCall = true; $this->firstCall = $firstCall;
$this->bytesMax = 0; $this->bytesMax = 0;
$this->content = null; $this->content = null;
$this->originUrl = $originUrl; $this->originUrl = $originUrl;
@ -163,7 +164,7 @@ class RemoteFilesystem
$password = $this->io->askAndHideAnswer(' Password: '); $password = $this->io->askAndHideAnswer(' Password: ');
$this->io->setAuthorization($this->originUrl, $username, $password); $this->io->setAuthorization($this->originUrl, $username, $password);
$this->content = $this->get($this->originUrl, $this->fileUrl, $this->fileName, $this->progress); $this->content = $this->get($this->originUrl, $this->fileUrl, $this->fileName, $this->progress, false);
} }
break; break;