qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 08:50:03 -07:00
Code Releases Activity

src/vendor: update to latest version of net

Browse Source 
Change-Id: Ide3b689dd6808fc82f6310e4608e6d3574fafa82
Reviewed-on: https://go-review.googlesource.com/c/go/+/205339
Run-TryBot: Marcel van Lohuizen <mpvl@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Marcel van Lohuizen 2019-11-05 18:02:15 +01:00 committed by Russ Cox
parent de70de6ede
commit f71bd516b7
6 changed files with 4757 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/go.mod
View File

@ -4,7 +4,7 @@ go 1.14
require (
golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8
golang.org/x/net v0.0.0-20191021124707-24d2ffbea1e8
golang.org/x/net v0.0.0-20191105084925-a882066a44e0
golang.org/x/sys v0.0.0-20190529130038-5219a1e1c5f8 // indirect
golang.org/x/text v0.3.3-0.20191031172631-4b67af870c6f // indirect
)

4
src/go.sum
View File

@ -2,8 +2,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 h1:1wopBVtVdWnn03fZelqdXTqk7U7zPQCb+T4rbU9ZEoU=
golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20191021124707-24d2ffbea1e8 h1:L4W1teiyF4Jl6VuapLNV/LYho36udiBQsfbNu7eRMeo=
golang.org/x/net v0.0.0-20191021124707-24d2ffbea1e8/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20191105084925-a882066a44e0 h1:QPlSTtPE2k6PZPasQUbzuK3p9JbS+vMXYVto8g/yrsg=
golang.org/x/net v0.0.0-20191105084925-a882066a44e0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190529130038-5219a1e1c5f8 h1:2WjIC11WRITGlVWmyLXKjzIVj1ZwoWZ//tadeUUV6/o=

2
src/vendor/golang.org/x/net/idna/tables11.0.0.go generated vendored
View File

@ -1,6 +1,6 @@
// Code generated by running "go generate" in golang.org/x/text. DO NOT EDIT.
// +build go1.13
// +build go1.13,!go1.14
package idna

4733
src/vendor/golang.org/x/net/idna/tables12.00.go generated vendored Normal file
View File

File diff suppressed because it is too large Load Diff

36
src/vendor/golang.org/x/net/nettest/nettest.go generated vendored
View File

@ -20,11 +20,11 @@ import (
)
var (
stackOnce sync.Once
ipv4Enabled bool
ipv6Enabled bool
rawSocketSess bool
aixTechLvl int
stackOnce sync.Once
ipv4Enabled bool
ipv6Enabled bool
unStrmDgramEnabled bool
rawSocketSess bool
aLongTimeAgo = time.Unix(233431200, 0)
neverTimeout = time.Time{}
@ -43,17 +43,24 @@ func probeStack() {
ipv6Enabled = true
}
rawSocketSess = supportsRawSocket()
if runtime.GOOS == "aix" {
out, err := exec.Command("oslevel", "-s").Output()
if err == nil {
aixTechLvl, _ = strconv.Atoi(string(out[5:7]))
switch runtime.GOOS {
case "aix":
// Unix network isn't properly working on AIX 7.2 with
// Technical Level < 2.
out, _ := exec.Command("oslevel", "-s").Output()
if len(out) >= len("7200-XX-ZZ-YYMM") { // AIX 7.2, Tech Level XX, Service Pack ZZ, date YYMM
ver := string(out[:4])
tl, _ := strconv.Atoi(string(out[5:7]))
unStrmDgramEnabled = ver > "7200" || (ver == "7200" && tl >= 2)
}
default:
unStrmDgramEnabled = true
}
}
func aixTechLevel() int {
func unixStrmDgramEnabled() bool {
stackOnce.Do(probeStack)
return aixTechLvl
return unStrmDgramEnabled
}
// SupportsIPv4 reports whether the platform supports IPv4 networking
@ -110,12 +117,7 @@ func TestableNetwork(network string) bool {
case "android", "fuchsia", "hurd", "js", "nacl", "plan9", "windows":
return false
case "aix":
// Unix network isn't properly working on AIX
// 7.2 with Technical Level < 2.
if aixTechLevel() < 2 {
return false
}
return true
return unixStrmDgramEnabled()
case "darwin":
// iOS does not support unix, unixgram.
if runtime.GOARCH == "arm" || runtime.GOARCH == "arm64" {

2
src/vendor/modules.txt vendored
View File

@ -8,7 +8,7 @@ golang.org/x/crypto/hkdf
golang.org/x/crypto/internal/chacha20
golang.org/x/crypto/internal/subtle
golang.org/x/crypto/poly1305
# golang.org/x/net v0.0.0-20191021124707-24d2ffbea1e8
# golang.org/x/net v0.0.0-20191105084925-a882066a44e0
## explicit
golang.org/x/net/dns/dnsmessage
golang.org/x/net/http/httpguts