Merge remote-tracking branch 'origin/master' into preprocessor

CocoaPods · May 28, 2016 · 2682966 · 2682966
2 parents 67f4245 + 272c56d
commit 2682966
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,11 +4,19 @@
 
 ##### Enhancements
 
+* When downloading via `HTTP`, `curl` won't force users from having a
+  `~/.netrc` file set up on their machine when the remote server requires
+  authentication.
+  [Sylvain Guillopé](https://github.com/sguillope)
+  [#55](https://github.com/CocoaPods/cocoapods-downloader/issues/55)
+  [CocoaPods#5318](https://github.com/CocoaPods/CocoaPods/issues/5318)
+
 * Allow download strategies to preprocess download options. This is used by
   `git` strategy to resolve branches into commits directly.
   [Juan Civile](https://github.com/champo)
   [Cocoapods#5386](https://github.com/CocoaPods/CocoaPods/pull/5386)
 
+
 ##### Bug Fixes
 
 * None.  

diff --git a/lib/cocoapods-downloader/http.rb b/lib/cocoapods-downloader/http.rb
@@ -90,7 +90,7 @@ def filename_with_type(type = :zip)
       end
 
       def download_file(full_filename)
-        curl! '-f', '-L', '-o', full_filename, url, '--create-dirs', '--netrc'
+        curl! '-f', '-L', '-o', full_filename, url, '--create-dirs', '--netrc-optional'
       end
 
       def extract_with_type(full_filename, type = :zip)