Fix body when proxying assets with status code > 300

This commit is contained in:
Omar Roth 2019-07-03 13:13:40 -05:00
parent b22393092b
commit 351ecfae0f
No known key found for this signature in database
GPG Key ID: B8254FB7EC3D37F2

View File

@ -4695,18 +4695,19 @@ get "/ggpht/*" do |env|
begin begin
client.get(url, headers) do |response| client.get(url, headers) do |response|
env.response.status_code = response.status_code
response.headers.each do |key, value| response.headers.each do |key, value|
if !RESPONSE_HEADERS_BLACKLIST.includes? key if !RESPONSE_HEADERS_BLACKLIST.includes? key
env.response.headers[key] = value env.response.headers[key] = value
end end
end end
if response.status_code == 304 env.response.headers["Access-Control-Allow-Origin"] = "*"
if response.status_code >= 300
break break
end end
env.response.headers["Access-Control-Allow-Origin"] = "*"
proxy_file(response, env) proxy_file(response, env)
end end
rescue ex rescue ex
@ -4750,12 +4751,12 @@ get "/sb/:id/:storyboard/:index" do |env|
end end
end end
if response.status_code >= 400 env.response.headers["Access-Control-Allow-Origin"] = "*"
if response.status_code >= 300
break break
end end
env.response.headers["Access-Control-Allow-Origin"] = "*"
proxy_file(response, env) proxy_file(response, env)
end end
rescue ex rescue ex
@ -4795,12 +4796,12 @@ get "/vi/:id/:name" do |env|
end end
end end
if response.status_code == 304 env.response.headers["Access-Control-Allow-Origin"] = "*"
if response.status_code >= 300
break break
end end
env.response.headers["Access-Control-Allow-Origin"] = "*"
proxy_file(response, env) proxy_file(response, env)
end end
rescue ex rescue ex