aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@golang.org>2020-04-02 09:04:24 -0700
committerBrad Fitzpatrick <bradfitz@golang.org>2020-04-02 22:10:27 +0000
commit2bed279721d684de828d0027db43a9d6283938a1 (patch)
tree5e259651b2791875dfeb9b1c0beaf3a9ce0475f6
parent48a90d639d578d2b33fdc1903f03e028b4d40fa9 (diff)
downloadgo-2bed279721d684de828d0027db43a9d6283938a1.tar.gz
go-2bed279721d684de828d0027db43a9d6283938a1.zip
net: update ParseIP doc to say IPv4-mapped-IPv6 is supported
Change-Id: I49a79c07081cd8f12a3ffef21fd02a9a622a7eb5 Reviewed-on: https://go-review.googlesource.com/c/go/+/226979 Reviewed-by: Ian Lance Taylor <iant@golang.org>
-rw-r--r--src/net/ip.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net/ip.go b/src/net/ip.go
index 9d1223e705..c00fe8ed3c 100644
--- a/src/net/ip.go
+++ b/src/net/ip.go
@@ -671,8 +671,8 @@ func parseIPv6(s string) (ip IP) {
}
// ParseIP parses s as an IP address, returning the result.
-// The string s can be in dotted decimal ("192.0.2.1")
-// or IPv6 ("2001:db8::68") form.
+// The string s can be in IPv4 dotted decimal ("192.0.2.1"), IPv6
+// ("2001:db8::68"), or IPv4-mapped IPv6 ("::ffff:192.0.2.1") form.
// If s is not a valid textual representation of an IP address,
// ParseIP returns nil.
func ParseIP(s string) IP {