Skip to content
代码片段 群组 项目
提交 0dc514c2 编辑于 作者: Stan Hu's avatar Stan Hu
浏览文件

Merge branch 'remove-redirects-import_export_command_line_util' into 'master'

Support 303 redirects when downloading via CommandLineUtil

See merge request gitlab-org/gitlab!83066
No related branches found
No related tags found
无相关合并请求
...@@ -66,7 +66,7 @@ def download(url, upload_path, size_limit: nil) ...@@ -66,7 +66,7 @@ def download(url, upload_path, size_limit: nil)
current_size = 0 current_size = 0
Gitlab::HTTP.get(url, stream_body: true, allow_object_storage: true) do |fragment| Gitlab::HTTP.get(url, stream_body: true, allow_object_storage: true) do |fragment|
if [301, 302, 307].include?(fragment.code) if [301, 302, 303, 307].include?(fragment.code)
Gitlab::Import::Logger.warn(message: "received redirect fragment", fragment_code: fragment.code) Gitlab::Import::Logger.warn(message: "received redirect fragment", fragment_code: fragment.code)
elsif fragment.code == 200 elsif fragment.code == 200
current_size += fragment.bytesize current_size += fragment.bytesize
......
...@@ -114,7 +114,7 @@ def initialize ...@@ -114,7 +114,7 @@ def initialize
end end
end end
%w[MOVED_PERMANENTLY FOUND TEMPORARY_REDIRECT].each do |code| %w[MOVED_PERMANENTLY FOUND SEE_OTHER TEMPORARY_REDIRECT].each do |code|
context "with a redirect status code #{code}" do context "with a redirect status code #{code}" do
let(:status) { HTTP::Status.const_get(code, false) } let(:status) { HTTP::Status.const_get(code, false) }
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册