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

Merge pull request #1850 from bitExpert/fix/recursive_get 

Fix for recursion problem with wrong http basic auth credentials
pull/1856/head
Jordi Boggiano 2013-05-02 07:41:58 -07:00
parent 29fcca8595 4d92626ef0
commit 7687d189e3
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,6 +112,7 @@ class RemoteFilesystem
$errorMessage = ''; $errorMessage = '';
$errorCode = 0; $errorCode = 0;
$result = false;
set_error_handler(function ($code, $msg) use (&$errorMessage) { set_error_handler(function ($code, $msg) use (&$errorMessage) {
if ($errorMessage) { if ($errorMessage) {
$errorMessage .= "\n"; $errorMessage .= "\n";
@ -188,7 +189,7 @@ class RemoteFilesystem
if ($this->retry) { if ($this->retry) {
$this->retry = false; $this->retry = false;
return $this->get($this->originUrl, $this->fileUrl, $this->fileName, $this->progress); return $this->get($this->originUrl, $this->fileUrl, $additionalOptions, $this->fileName, $this->progress);
} }
if (false === $result) { if (false === $result) {