Skip to content

Preserve FTP query and fragment in destructive merges #258

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
OskarEichler wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −0
Open

Preserve FTP query and fragment in destructive merges #258

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
10 changes: 10 additions & 0 deletions lib/uri/ftp.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,16 @@ def merge(oth) # :nodoc:
return tmp
end

def merge!(oth) # :nodoc:
tmp = merge(oth)
return if self == tmp && query == tmp.query && fragment == tmp.fragment

replace!(tmp)
self.query = tmp.query
self.fragment = tmp.fragment
self
end

# Returns the path from an FTP URI.
#
# RFC 1738 specifically states that the path for an FTP URI does not
Expand Down