diff options
| author | Brad Fitzpatrick <bradfitz@golang.org> | 2017-06-14 22:04:33 +0000 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2017-06-14 22:11:04 +0000 |
| commit | 2f55031c593ae842ab383c911aadcaee97a6715e (patch) | |
| tree | ad21570e870d9c0ecdf3efd9ca94a9e98d7478c6 /src/net/ipsock.go | |
| parent | 862e45d49d07ab1cdf79763763cc29ed6d311a20 (diff) | |
| download | go-2f55031c593ae842ab383c911aadcaee97a6715e.tar.xz | |
net, doc: document JoinHostPort change in release notes, clarify its docs
Updates #18059
Updates #20587
Change-Id: Icbb4c7cb201ac51d2cc6066620b47ba09ff6fe65
Reviewed-on: https://go-review.googlesource.com/45780
Reviewed-by: Chris Broadfoot <cbro@golang.org>
Diffstat (limited to 'src/net/ipsock.go')
| -rw-r--r-- | src/net/ipsock.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/net/ipsock.go b/src/net/ipsock.go index 6049692d37..201c3f58bc 100644 --- a/src/net/ipsock.go +++ b/src/net/ipsock.go @@ -194,8 +194,8 @@ func splitHostZone(s string) (host, zone string) { } // JoinHostPort combines host and port into a network address of the -// form "host:port" or "host%zone:port", if host is a literal IPv6 -// address, "[host]:port" or [host%zone]:port. +// form "host:port". If host contains a colon, as found in literal +// IPv6 addresses, then JoinHostPort returns "[host]:port". func JoinHostPort(host, port string) string { // We assume that host is a literal IPv6 address if host has // colons. |