lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-25 23:41:28 +00:00
Code Issues Releases Activity

Merge pull request #683 from chrisport/develop

Browse Source 
beego/context: Fix ignored Header in case SetStatus has been called before
This commit is contained in:
astaxie 2014-07-09 08:39:54 +08:00
commit 46cde6e579
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
context/output.go
View File

@ -71,6 +71,14 @@ func (output *BeegoOutput) Body(content []byte) {
} else { } else {
output.Header("Content-Length", strconv.Itoa(len(content))) output.Header("Content-Length", strconv.Itoa(len(content)))
} }
// Write status code if it has been set manually
// Set it to 0 afterwards to prevent "multiple response.WriteHeader calls"
if output.Status != 0 {
output.Context.ResponseWriter.WriteHeader(output.Status)
output.Status = 0
}
output_writer.Write(content) output_writer.Write(content)
switch output_writer.(type) { switch output_writer.(type) {
case *gzip.Writer: case *gzip.Writer:
@ -270,7 +278,6 @@ func (output *BeegoOutput) ContentType(ext string) {
// SetStatus sets response status code. // SetStatus sets response status code.
// It writes response header directly. // It writes response header directly.
func (output *BeegoOutput) SetStatus(status int) { func (output *BeegoOutput) SetStatus(status int) {
output.Context.ResponseWriter.WriteHeader(status)
output.Status = status output.Status = status
} }

5
router.go
View File

@ -762,6 +762,11 @@ Admin:
Info("beego:" + r.URL.Path + " 404" + " +" + timeend.String()) Info("beego:" + r.URL.Path + " 404" + " +" + timeend.String())
} }
} }
// Call WriteHeader if status code has been set changed
if context.Output.Status != 0 {
w.writer.WriteHeader(context.Output.Status)
}
} }
func (p *ControllerRegistor) recoverPanic(rw http.ResponseWriter, r *http.Request) { func (p *ControllerRegistor) recoverPanic(rw http.ResponseWriter, r *http.Request) {