diff options
| author | Brad Fitzpatrick <bradfitz@golang.org> | 2013-03-20 09:06:33 -0700 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2013-03-20 09:06:33 -0700 |
| commit | bd21f7f1b59325d128bec1d26074aba75dc18b04 (patch) | |
| tree | 323bd521d5392c4799d411e89a0cbeaf45c021e5 /src/pkg | |
| parent | eeb9822457e398f59b3620e2b719a950dcf891ff (diff) | |
| download | go-bd21f7f1b59325d128bec1d26074aba75dc18b04.tar.xz | |
net/http/fcgi: Request.Body should always be non-nil
Found this inconsistency from net/http's Server while
debugging Issue 4183
Unfortunately this package lacks testing around this,
or most of child.go. :/
R=golang-dev, adg
CC=golang-dev
https://golang.org/cl/7735046
Diffstat (limited to 'src/pkg')
| -rw-r--r-- | src/pkg/net/http/fcgi/child.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/pkg/net/http/fcgi/child.go b/src/pkg/net/http/fcgi/child.go index e647f9391e..f36abbcca3 100644 --- a/src/pkg/net/http/fcgi/child.go +++ b/src/pkg/net/http/fcgi/child.go @@ -10,10 +10,12 @@ import ( "errors" "fmt" "io" + "io/ioutil" "net" "net/http" "net/http/cgi" "os" + "strings" "time" ) @@ -152,6 +154,8 @@ func (c *child) serve() { var errCloseConn = errors.New("fcgi: connection should be closed") +var emptyBody = ioutil.NopCloser(strings.NewReader("")) + func (c *child) handleRecord(rec *record) error { req, ok := c.requests[rec.h.Id] if !ok && rec.h.Type != typeBeginRequest && rec.h.Type != typeGetValues { @@ -191,6 +195,8 @@ func (c *child) handleRecord(rec *record) error { // body could be an io.LimitReader, but it shouldn't matter // as long as both sides are behaving. body, req.pw = io.Pipe() + } else { + body = emptyBody } go c.serveRequest(req, body) } @@ -232,9 +238,7 @@ func (c *child) serveRequest(req *request, body io.ReadCloser) { httpReq.Body = body c.handler.ServeHTTP(r, httpReq) } - if body != nil { - body.Close() - } + body.Close() r.Close() c.conn.writeEndRequest(req.reqId, 0, statusRequestComplete) if !req.keepConn { |