Skip to content
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

Address warning: URI::RFC3986_PARSER warnings #1620

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

Address warning: URI::RFC3986_PARSER warnings #1620

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
8 changes: 6 additions & 2 deletions lib/mail/utilities.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,11 @@ def uri_unescape( str )
end

def uri_parser
@uri_parser ||= URI.const_defined?(:DEFAULT_PARSER) ? URI::DEFAULT_PARSER : URI
@uri_parser ||= if URI.const_defined?(:DEFAULT_PARSER)
defined?(URI::RFC2396_PARSER) ? URI::RFC2396_PARSER : URI::DEFAULT_PARSER
else
URI
end
end

# Matches two objects with their to_s values case insensitively
Expand Down Expand Up @@ -464,7 +468,7 @@ def Utilities.param_encode(str)
end

def Utilities.uri_parser
URI::DEFAULT_PARSER
defined?(URI::RFC2396_PARSER) ? URI::RFC2396_PARSER : URI::DEFAULT_PARSER
end

# Pick a Ruby encoding corresponding to the message charset. Most
Expand Down