diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-04-08 18:36:25 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-04-08 18:36:25 +0000 |
| commit | 04862afe9f5c54a420823f95bb6ae152eec64b8b (patch) | |
| tree | 7b77ac8c94329f12ebde6ac6c869b0af05a92f85 /libgo/go/net/lookup.go | |
| parent | 8108dfde82ad6ec43613107b2c156999e6a5cbe7 (diff) | |
libgo: update to Go 1.12.2
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/170706
From-SVN: r270214
Diffstat (limited to 'libgo/go/net/lookup.go')
| -rw-r--r-- | libgo/go/net/lookup.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libgo/go/net/lookup.go b/libgo/go/net/lookup.go index e10889331e4..08e8d013855 100644 --- a/libgo/go/net/lookup.go +++ b/libgo/go/net/lookup.go @@ -262,8 +262,9 @@ func (r *Resolver) lookupIPAddr(ctx context.Context, network, host string) ([]IP // only the values in context. See Issue 28600. lookupGroupCtx, lookupGroupCancel := context.WithCancel(withUnexpiredValuesPreserved(ctx)) + lookupKey := network + "\000" + host dnsWaitGroup.Add(1) - ch, called := r.getLookupGroup().DoChan(host, func() (interface{}, error) { + ch, called := r.getLookupGroup().DoChan(lookupKey, func() (interface{}, error) { defer dnsWaitGroup.Done() return testHookLookupIP(lookupGroupCtx, resolverFunc, network, host) }) @@ -280,7 +281,7 @@ func (r *Resolver) lookupIPAddr(ctx context.Context, network, host string) ([]IP // let the lookup continue uncanceled, and let later // lookups with the same key share the result. // See issues 8602, 20703, 22724. - if r.getLookupGroup().ForgetUnshared(host) { + if r.getLookupGroup().ForgetUnshared(lookupKey) { lookupGroupCancel() } else { go func() { |