Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-11-10 21:51:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

net/http: enable automatic HTTP/2 if TLSNextProto is nil

Browse source 
This enables HTTP/2 by default (for https only) if the user didn't
configure anything in their NPN/ALPN map. If they're using SPDY or an
alternate http2 or a newer http2 from x/net/http2, we do nothing
and don't use the standard library's vendored copy of x/net/http2.

Upstream remains golang.org/x/net/http2.

Update #6891

Change-Id: I69a8957a021a00ac353f9d7fdb9a40a5b69f2199
Reviewed-on: https://go-review.googlesource.com/15828
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Andrew Gerrand <adg@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Brad Fitzpatrick 2015-10-14 20:41:36 +00:00
parent 7a3dcd2d0f
commit 20736fcab9
4 changed files with 35 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/cmd/api/goapi.go
View file

@ -428,10 +428,15 @@ func (w *Walker) Import(name string) (*types.Package, error) {
}
w.imported[name] = &importing
root := w.root
if strings.HasPrefix(name, "golang.org/x/") {
root = filepath.Join(root, "vendor")
}
// Determine package files.
dir := filepath.Join(w.root, filepath.FromSlash(name))
dir := filepath.Join(root, filepath.FromSlash(name))
if fi, err := os.Stat(dir); err != nil || !fi.IsDir() {
log.Fatalf("no source in tree for package %q", pkg)
log.Fatalf("no source in tree for import %q: %v", name, err)
}
context := w.context