From 9b54af20204128a655ccea895bf668a5ef4e0309 Mon Sep 17 00:00:00 2001 From: Gustavo Niemeyer Date: Tue, 17 Jan 2012 00:55:35 -0200 Subject: [PATCH] exp/proxy: fix build after URL changes R=golang-dev CC=golang-dev https://golang.org/cl/5540062 --- src/pkg/exp/proxy/proxy.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/pkg/exp/proxy/proxy.go b/src/pkg/exp/proxy/proxy.go index ccd3d1d8b8..b6cfd45108 100644 --- a/src/pkg/exp/proxy/proxy.go +++ b/src/pkg/exp/proxy/proxy.go @@ -11,7 +11,6 @@ import ( "net" "net/url" "os" - "strings" ) // A Dialer is a means to establish a connection. @@ -70,14 +69,11 @@ func RegisterDialerType(scheme string, f func(*url.URL, Dialer) (Dialer, error)) // Dialer for it to make network requests. func FromURL(u *url.URL, forward Dialer) (Dialer, error) { var auth *Auth - if len(u.RawUserinfo) > 0 { + if u.User != nil { auth = new(Auth) - parts := strings.SplitN(u.RawUserinfo, ":", 1) - if len(parts) == 1 { - auth.User = parts[0] - } else if len(parts) >= 2 { - auth.User = parts[0] - auth.Password = parts[1] + auth.User = u.User.Username() + if p, ok := u.User.Password(); ok { + auth.Password = p } } -- 2.48.1