Fix CurlApacheMirrorDownloadStrategy URL resolution.

2018-09-02 03:30:37 +02:00 · 2018-09-02 03:30:37 +02:00 · e377bdb6fe
commit e377bdb6fe
parent b54682f709
1 changed files with 9 additions and 6 deletions
--- a/Library/Homebrew/download_strategy.rb
+++ b/Library/Homebrew/download_strategy.rb
@ -405,12 +405,15 @@ class CurlApacheMirrorDownloadStrategy < CurlDownloadStrategy

  private

-  def resolved_url_and_basename
-    return @resolved_url_and_basename if defined?(@resolved_url_and_basename)
-    @resolved_url_and_basename = [
+  def resolve_url_and_basename(url)
+    if url == self.url
+      [
        "#{apache_mirrors["preferred"]}#{apache_mirrors["path_info"]}",
        File.basename(apache_mirrors["path_info"]),
      ]
+    else
+      super
+    end
  end

  def apache_mirrors