Merge pull request #13195 from samford/curl_http_content_headers_and_checksum-reinstate-old-return-behavior
Curl: Remove guard from certain parsing logic
This commit is contained in:
commit
048f849895
@ -345,7 +345,6 @@ module Utils
|
|||||||
user_agent: user_agent
|
user_agent: user_agent
|
||||||
)
|
)
|
||||||
|
|
||||||
if status.success?
|
|
||||||
parsed_output = parse_curl_output(output)
|
parsed_output = parse_curl_output(output)
|
||||||
responses = parsed_output[:responses]
|
responses = parsed_output[:responses]
|
||||||
|
|
||||||
@ -359,6 +358,7 @@ module Utils
|
|||||||
etag = headers["etag"][ETAG_VALUE_REGEX, 1] if headers["etag"].present?
|
etag = headers["etag"][ETAG_VALUE_REGEX, 1] if headers["etag"].present?
|
||||||
content_length = headers["content-length"]
|
content_length = headers["content-length"]
|
||||||
|
|
||||||
|
if status.success?
|
||||||
file_contents = File.read(file.path)
|
file_contents = File.read(file.path)
|
||||||
file_hash = Digest::SHA2.hexdigest(file_contents) if hash_needed
|
file_hash = Digest::SHA2.hexdigest(file_contents) if hash_needed
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user