Merge remote-tracking branch 'upstream/master'

Conflicts:
	middleware/fastcgi/fastcgi.go
This commit is contained in:
Mathias Beke
2015-09-28 22:11:05 +02:00
4 changed files with 22 additions and 7 deletions

View File

@ -381,9 +381,9 @@ func (c *FCGIClient) Request(p map[string]string, req io.Reader) (resp *http.Res
return
}
if len(statusParts) > 1 {
resp.Status = statusParts[1]
resp.Status = statusParts[1]
}
} else {
resp.StatusCode = http.StatusOK
}