diff options
| author | Ondřej Surý <ondrej@sury.org> | 2012-03-26 16:50:58 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2012-03-26 16:50:58 +0200 |
| commit | 519725bb3c075ee2462c929f5997cb068e18466a (patch) | |
| tree | 5b162e8488ad147a645048c073577821b4a2bee9 /src/pkg/net/http/request.go | |
| parent | 842623c5dd2819d980ca9c58048d6bc6ed82475f (diff) | |
| download | golang-upstream-weekly/2012.03.22.tar.gz | |
Imported Upstream version 2012.03.22upstream-weekly/2012.03.22
Diffstat (limited to 'src/pkg/net/http/request.go')
| -rw-r--r-- | src/pkg/net/http/request.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/pkg/net/http/request.go b/src/pkg/net/http/request.go index 527765780..f5bc6eb91 100644 --- a/src/pkg/net/http/request.go +++ b/src/pkg/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 { |