diff options
Diffstat (limited to 'libgo/go')
-rw-r--r-- | libgo/go/cmd/go/alldocs.go | 1 | ||||
-rw-r--r-- | libgo/go/cmd/go/build.go | 1 | ||||
-rw-r--r-- | libgo/go/cmd/go/pkg.go | 3 | ||||
-rw-r--r-- | libgo/go/fmt/scan.go | 13 | ||||
-rw-r--r-- | libgo/go/fmt/scan_test.go | 11 | ||||
-rw-r--r-- | libgo/go/internal/syscall/windows/registry/value.go | 1 | ||||
-rw-r--r-- | libgo/go/net/cgo_solaris.go | 2 | ||||
-rw-r--r-- | libgo/go/net/http/httputil/reverseproxy.go | 5 | ||||
-rw-r--r-- | libgo/go/net/http/httputil/reverseproxy_test.go | 39 | ||||
-rw-r--r-- | libgo/go/net/lookup.go | 3 | ||||
-rw-r--r-- | libgo/go/net/port_test.go | 2 | ||||
-rw-r--r-- | libgo/go/runtime/extern.go | 3 | ||||
-rw-r--r-- | libgo/go/runtime/gc_test.go | 17 |
13 files changed, 87 insertions, 14 deletions
diff --git a/libgo/go/cmd/go/alldocs.go b/libgo/go/cmd/go/alldocs.go index 6077d93..1134997 100644 --- a/libgo/go/cmd/go/alldocs.go +++ b/libgo/go/cmd/go/alldocs.go @@ -81,7 +81,6 @@ and test commands: -a force rebuilding of packages that are already up-to-date. - In Go releases, does not apply to the standard library. -n print the commands but do not run them. -p n diff --git a/libgo/go/cmd/go/build.go b/libgo/go/cmd/go/build.go index 56b15ad..3afac2e 100644 --- a/libgo/go/cmd/go/build.go +++ b/libgo/go/cmd/go/build.go @@ -60,7 +60,6 @@ and test commands: -a force rebuilding of packages that are already up-to-date. - In Go releases, does not apply to the standard library. -n print the commands but do not run them. -p n diff --git a/libgo/go/cmd/go/pkg.go b/libgo/go/cmd/go/pkg.go index 1af59b3..ff5236e 100644 --- a/libgo/go/cmd/go/pkg.go +++ b/libgo/go/cmd/go/pkg.go @@ -372,7 +372,8 @@ func loadImport(path, srcDir string, parent *Package, stk *importStack, importPo if gobin != "" { bp.BinDir = gobin } - if err == nil && !isLocal && bp.ImportComment != "" && bp.ImportComment != path && (!go15VendorExperiment || !strings.Contains(path, "/vendor/")) { + if err == nil && !isLocal && bp.ImportComment != "" && bp.ImportComment != path && + (!go15VendorExperiment || (!strings.Contains(path, "/vendor/") && !strings.HasPrefix(path, "vendor/"))) { err = fmt.Errorf("code in directory %s expects import %q", bp.Dir, bp.ImportComment) } p.load(stk, bp, err) diff --git a/libgo/go/fmt/scan.go b/libgo/go/fmt/scan.go index 5b9b516..e3e0fd0 100644 --- a/libgo/go/fmt/scan.go +++ b/libgo/go/fmt/scan.go @@ -83,6 +83,8 @@ func Scanln(a ...interface{}) (n int, err error) { // the format. It returns the number of items successfully scanned. // If that is less than the number of arguments, err will report why. // Newlines in the input must match newlines in the format. +// The one exception: the verb %c always scans the next rune in the +// input, even if it is a space (or tab etc.) or newline. func Scanf(format string, a ...interface{}) (n int, err error) { return Fscanf(os.Stdin, format, a...) } @@ -1164,15 +1166,18 @@ func (s *ss) doScanf(format string, a []interface{}) (numProcessed int, err erro if !widPresent { s.maxWid = hugeWid } - s.SkipSpace() + + c, w := utf8.DecodeRuneInString(format[i:]) + i += w + + if c != 'c' { + s.SkipSpace() + } s.argLimit = s.limit if f := s.count + s.maxWid; f < s.argLimit { s.argLimit = f } - c, w := utf8.DecodeRuneInString(format[i:]) - i += w - if numProcessed >= len(a) { // out of operands s.errorString("too few operands for format %" + format[i-w:]) break diff --git a/libgo/go/fmt/scan_test.go b/libgo/go/fmt/scan_test.go index a378436..334c4a6 100644 --- a/libgo/go/fmt/scan_test.go +++ b/libgo/go/fmt/scan_test.go @@ -300,10 +300,13 @@ var scanfTests = []ScanfTest{ {"%2s", "sssss", &xVal, Xs("ss")}, // Fixed bugs - {"%d\n", "27\n", &intVal, 27}, // ok - {"%d\n", "28 \n", &intVal, 28}, // was: "unexpected newline" - {"%v", "0", &intVal, 0}, // was: "EOF"; 0 was taken as base prefix and not counted. - {"%v", "0", &uintVal, uint(0)}, // was: "EOF"; 0 was taken as base prefix and not counted. + {"%d\n", "27\n", &intVal, 27}, // ok + {"%d\n", "28 \n", &intVal, 28}, // was: "unexpected newline" + {"%v", "0", &intVal, 0}, // was: "EOF"; 0 was taken as base prefix and not counted. + {"%v", "0", &uintVal, uint(0)}, // was: "EOF"; 0 was taken as base prefix and not counted. + {"%c", " ", &uintVal, uint(' ')}, // %c must accept a blank. + {"%c", "\t", &uintVal, uint('\t')}, // %c must accept any space. + {"%c", "\n", &uintVal, uint('\n')}, // %c must accept any space. } var overflowTests = []ScanTest{ diff --git a/libgo/go/internal/syscall/windows/registry/value.go b/libgo/go/internal/syscall/windows/registry/value.go index bb45a23..f4bb1b3 100644 --- a/libgo/go/internal/syscall/windows/registry/value.go +++ b/libgo/go/internal/syscall/windows/registry/value.go @@ -310,7 +310,6 @@ loopItems: break } if err == syscall.ERROR_MORE_DATA { - println(len(buf), l) // Double buffer size and try again. l = uint32(2 * len(buf)) buf = make([]uint16, l) diff --git a/libgo/go/net/cgo_solaris.go b/libgo/go/net/cgo_solaris.go index c5a7a35..05811c6 100644 --- a/libgo/go/net/cgo_solaris.go +++ b/libgo/go/net/cgo_solaris.go @@ -7,7 +7,7 @@ package net /* -#cgo LDFLAGS: -lsocket -lnsl +#cgo LDFLAGS: -lsocket -lnsl -lsendfile #include <netdb.h> */ diff --git a/libgo/go/net/http/httputil/reverseproxy.go b/libgo/go/net/http/httputil/reverseproxy.go index 3b7a184..c8e1132 100644 --- a/libgo/go/net/http/httputil/reverseproxy.go +++ b/libgo/go/net/http/httputil/reverseproxy.go @@ -105,7 +105,7 @@ type requestCanceler interface { } type runOnFirstRead struct { - io.Reader + io.Reader // optional; nil means empty body fn func() // Run before first Read, then set to nil } @@ -115,6 +115,9 @@ func (c *runOnFirstRead) Read(bs []byte) (int, error) { c.fn() c.fn = nil } + if c.Reader == nil { + return 0, io.EOF + } return c.Reader.Read(bs) } diff --git a/libgo/go/net/http/httputil/reverseproxy_test.go b/libgo/go/net/http/httputil/reverseproxy_test.go index 25947e6..80a26ab 100644 --- a/libgo/go/net/http/httputil/reverseproxy_test.go +++ b/libgo/go/net/http/httputil/reverseproxy_test.go @@ -7,6 +7,7 @@ package httputil import ( + "bufio" "io/ioutil" "log" "net/http" @@ -281,3 +282,41 @@ func TestReverseProxyCancellation(t *testing.T) { t.Fatal("DefaultClient.Do() returned nil error") } } + +func req(t *testing.T, v string) *http.Request { + req, err := http.ReadRequest(bufio.NewReader(strings.NewReader(v))) + if err != nil { + t.Fatal(err) + } + return req +} + +// Issue 12344 +func TestNilBody(t *testing.T) { + backend := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + w.Write([]byte("hi")) + })) + defer backend.Close() + + frontend := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { + backURL, _ := url.Parse(backend.URL) + rp := NewSingleHostReverseProxy(backURL) + r := req(t, "GET / HTTP/1.0\r\n\r\n") + r.Body = nil // this accidentally worked in Go 1.4 and below, so keep it working + rp.ServeHTTP(w, r) + })) + defer frontend.Close() + + res, err := http.Get(frontend.URL) + if err != nil { + t.Fatal(err) + } + defer res.Body.Close() + slurp, err := ioutil.ReadAll(res.Body) + if err != nil { + t.Fatal(err) + } + if string(slurp) != "hi" { + t.Errorf("Got %q; want %q", slurp, "hi") + } +} diff --git a/libgo/go/net/lookup.go b/libgo/go/net/lookup.go index a7ceee8..9008322 100644 --- a/libgo/go/net/lookup.go +++ b/libgo/go/net/lookup.go @@ -123,6 +123,9 @@ func lookupIPDeadline(host string, deadline time.Time) (addrs []IPAddr, err erro // LookupPort looks up the port for the given network and service. func LookupPort(network, service string) (port int, err error) { + if n, i, ok := dtoi(service, 0); ok && i == len(service) { + return n, nil + } return lookupPort(network, service) } diff --git a/libgo/go/net/port_test.go b/libgo/go/net/port_test.go index 2dacd97..258a5bd 100644 --- a/libgo/go/net/port_test.go +++ b/libgo/go/net/port_test.go @@ -27,6 +27,7 @@ var portTests = []struct { {"tcp", "time", 37, true}, {"tcp", "domain", 53, true}, {"tcp", "finger", 79, true}, + {"tcp", "42", 42, true}, {"udp", "echo", 7, true}, {"udp", "tftp", 69, true}, @@ -36,6 +37,7 @@ var portTests = []struct { {"udp", "ntp", 123, true}, {"udp", "snmp", 161, true}, {"udp", "syslog", 514, true}, + {"udp", "42", 42, true}, {"--badnet--", "zzz", 0, false}, {"tcp", "--badport--", 0, false}, diff --git a/libgo/go/runtime/extern.go b/libgo/go/runtime/extern.go index 1f6b13e..6301d01 100644 --- a/libgo/go/runtime/extern.go +++ b/libgo/go/runtime/extern.go @@ -47,6 +47,9 @@ It is a comma-separated list of name=val pairs setting these named variables: that allow the garbage collector to avoid repeating a stack scan during the mark termination phase. + gcstackbarrierall: setting gcstackbarrierall=1 installs stack barriers + in every stack frame, rather than in exponentially-spaced frames. + gcstoptheworld: setting gcstoptheworld=1 disables concurrent garbage collection, making every garbage collection a stop-the-world event. Setting gcstoptheworld=2 also disables concurrent sweeping after the garbage collection finishes. diff --git a/libgo/go/runtime/gc_test.go b/libgo/go/runtime/gc_test.go index 262f87d..2a95cc7 100644 --- a/libgo/go/runtime/gc_test.go +++ b/libgo/go/runtime/gc_test.go @@ -471,4 +471,21 @@ func testAssertVar(x interface{}) error { return nil } +func TestAssertE2T2Liveness(t *testing.T) { + *runtime.TestingAssertE2T2GC = true + defer func() { + *runtime.TestingAssertE2T2GC = false + }() + + poisonStack() + testIfaceEqual(io.EOF) +} + +func testIfaceEqual(x interface{}) { + if x == "abc" { + // Prevent inlining + panic("") + } +} + */ |