소스 검색

Fix for recursion problem with wrong http basic auth credentials. First
I got an "array_replace_recursive(): Argument #2 is not an array" error
and after fixing that it resulted in another error saying "Undefined
variable: result".

Stephan Hochdörfer 12 년 전
부모
커밋
4d92626ef0
1개의 변경된 파일2개의 추가작업 그리고 1개의 파일을 삭제
  1. 2 1
      src/Composer/Util/RemoteFilesystem.php

+ 2 - 1
src/Composer/Util/RemoteFilesystem.php

@@ -112,6 +112,7 @@ class RemoteFilesystem
 
         $errorMessage = '';
         $errorCode = 0;
+        $result = false;
         set_error_handler(function ($code, $msg) use (&$errorMessage) {
             if ($errorMessage) {
                 $errorMessage .= "\n";
@@ -188,7 +189,7 @@ class RemoteFilesystem
         if ($this->retry) {
             $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) {