Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

Update information for IDN usage with InternetDomainName #5929

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

Update information for IDN usage with InternetDomainName #5929

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
14 changes: 8 additions & 6 deletions guava/src/com/google/common/net/InternetDomainName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,11 @@
* be reflected in the result of {@link #equals(Object)}.
*
* <p><a href="http://en.wikipedia.org/wiki/Internationalized_domain_name">Internationalized domain
* names</a> such as {@code 网络.cn} are supported, as are the equivalent <a
* names (IDN)</a> such as {@code 网络.cn} are supported, as are the equivalent <a
* href="http://en.wikipedia.org/wiki/Internationalized_domain_name">IDNA Punycode-encoded</a>
* versions.
* versions. However, IDN are not validated against <a href="http://www.ietf.org/rfc/rfc5890.txt">
* RFC 5890</a> ("Internationalized Domain Names for Applications"), therefore using another
* library for IDN validation may be required.
*
* @author Catherine Berry
* @since 5.0
Expand Down Expand Up @@ -189,8 +191,8 @@ private int findSuffixOfType(Optional<PublicSuffixType> desiredType) {

/**
* Returns an instance of {@link InternetDomainName} after lenient validation. Specifically,
* validation against <a href="http://www.ietf.org/rfc/rfc3490.txt">RFC 3490</a>
* ("Internationalizing Domain Names in Applications") is skipped, while validation against <a
* validation against <a href="http://www.ietf.org/rfc/rfc5890.txt">RFC 5890</a>
* ("Internationalized Domain Names for Applications") is skipped, while validation against <a
* href="http://www.ietf.org/rfc/rfc1035.txt">RFC 1035</a> is relaxed in the following ways:
*
* <ul>
Expand Down Expand Up @@ -561,8 +563,8 @@ public InternetDomainName child(String leftParts) {

/**
* Indicates whether the argument is a syntactically valid domain name using lenient validation.
* Specifically, validation against <a href="http://www.ietf.org/rfc/rfc3490.txt">RFC 3490</a>
* ("Internationalizing Domain Names in Applications") is skipped.
* Specifically, validation against <a href="http://www.ietf.org/rfc/rfc5890.txt">RFC 5890</a>
* ("Internationalized Domain Names for Applications") is skipped.
*
* <p>The following two code snippets are equivalent:
*
Expand Down