From: Brad Fitzpatrick Date: Thu, 2 Apr 2020 16:04:24 +0000 (-0700) Subject: net: update ParseIP doc to say IPv4-mapped-IPv6 is supported X-Git-Tag: go1.15beta1~678 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=2bed279721d684de828d0027db43a9d6283938a1;p=gostls13.git 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 --- 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 {