Просмотр исходного кода

opts: ParseTCPAddr(): remove workaround for go1.5

Current versions of Go no longer have a problem with the trailing
colon when using url.Parse() or net.SplitHostPort(), so we can remove
this workaround.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn 3 лет назад
Родитель
Сommit
eebd8d3c0c
1 измененных файлов с 0 добавлено и 7 удалено
  1. 0 7
      opts/hosts.go

+ 0 - 7
opts/hosts.go

@@ -132,13 +132,6 @@ func ParseTCPAddr(tryAddr string, defaultAddr string) (string, error) {
 	if err != nil {
 	if err != nil {
 		return "", err
 		return "", err
 	}
 	}
-	// url.Parse fails for trailing colon on IPv6 brackets on Go 1.5, but
-	// not 1.4. See https://github.com/golang/go/issues/12200 and
-	// https://github.com/golang/go/issues/6530.
-	if strings.HasSuffix(addr, "]:") {
-		addr += defaultPort
-	}
-
 	u, err := url.Parse("tcp://" + addr)
 	u, err := url.Parse("tcp://" + addr)
 	if err != nil {
 	if err != nil {
 		return "", err
 		return "", err