diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-04-03 11:15:51 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-04-03 11:15:51 -0700 |
| commit | c924cab2fd8932bdfb107c4ca7d26128ba56f19e (patch) | |
| tree | 0eea6430e211564fc331f66625373ec761837982 /libgo/go/net/http/request.go | |
| parent | 4c15f6d5728cb694d7d954b2c20409fdc0400b9e (diff) | |
| parent | 3cef948a814542119083003a3c35a24e036230b6 (diff) | |
| download | gcc-c924cab2fd8932bdfb107c4ca7d26128ba56f19e.tar.gz | |
Merge remote-tracking branch 'origin/master' into hjl/x32/addr32hjl/x32/addr32
Diffstat (limited to 'libgo/go/net/http/request.go')
| -rw-r--r-- | libgo/go/net/http/request.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libgo/go/net/http/request.go b/libgo/go/net/http/request.go index 5277657805d..f5bc6eb9100 100644 --- a/libgo/go/net/http/request.go +++ b/libgo/go/net/http/request.go @@ -455,11 +455,13 @@ func ReadRequest(b *bufio.Reader) (req *Request, err error) { // First line: GET /index.html HTTP/1.0 var s string if s, err = tp.ReadLine(); err != nil { + return nil, err + } + defer func() { if err == io.EOF { err = io.ErrUnexpectedEOF } - return nil, err - } + }() var f []string if f = strings.SplitN(s, " ", 3); len(f) < 3 { |