Skip to content

Fix for potential issue where application is using both aws-s3 and right_http_connection #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gammons wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for potential issue where application is using both aws-s3 and right_http_connection #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion lib/net_fix.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,14 @@ def exec(sock, ver, path, send_only=nil) #:nodoc: internal use only
if @body
send_request_with_body sock, ver, path, @body, send_only
elsif @body_stream
send_request_with_body_stream sock, ver, path, @body_stream, send_only
begin
send_request_with_body_stream sock, ver, path, @body_stream, send_only
rescue ArgumentError
# this rescue is called when users have both net_http_connection and aws-s3 gem installed.
# For whatever reason, sometimes this method gets redefined by aws-s3 (depending on load order)
# the aws-s3 gem only has 4 options, not 5, so users see an ArgumentError (5 for 4) when this gets called.
send_request_with_body_stream sock, ver, path, @body_stream
end
else
write_header(sock, ver, path)
end
Expand Down