lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-22 18:50:54 +00:00
Code Issues Releases Activity

accept asta's idea see the talk

Browse Source 
https://github.com/astaxie/beego/pull/1719
This commit is contained in:
JessonChan 2016-03-09 15:56:18 +08:00
parent b30ce768f8
commit 9a2696d216
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
context/context.go
View File

@ -177,14 +177,12 @@ type Response struct {
http.ResponseWriter http.ResponseWriter
Started bool Started bool
Status int Status int
wroteHeader bool
} }
func (r *Response) reset(rw http.ResponseWriter) { func (r *Response) reset(rw http.ResponseWriter) {
r.ResponseWriter = rw r.ResponseWriter = rw
r.Status = 0 r.Status = 0
r.Started = false r.Started = false
r.wroteHeader = false
} }
// Write writes the data to the connection as part of an HTTP reply, // Write writes the data to the connection as part of an HTTP reply,
@ -192,11 +190,6 @@ func (r *Response) reset(rw http.ResponseWriter) {
// started means the response has sent out. // started means the response has sent out.
func (w *Response) Write(p []byte) (int, error) { func (w *Response) Write(p []byte) (int, error) {
w.Started = true w.Started = true
if !w.wroteHeader {
w.ResponseWriter.WriteHeader(w.Status)
//prevent multiple response.WriteHeader calls
w.wroteHeader = true
}
return w.ResponseWriter.Write(p) return w.ResponseWriter.Write(p)
} }
@ -204,10 +197,12 @@ func (w *Response) Write(p []byte) (int, error) {
// and sets `started` to true. // and sets `started` to true.
func (w *Response) WriteHeader(code int) { func (w *Response) WriteHeader(code int) {
if w.Status > 0 { if w.Status > 0 {
//prevent multiple response.WriteHeader calls
return return
} }
w.Status = code w.Status = code
w.Started = true w.Started = true
w.ResponseWriter.WriteHeader(w.Status)
} }
// Hijack hijacker for http // Hijack hijacker for http

2
controller.go
View File

@ -286,7 +286,7 @@ func (c *Controller) Abort(code string) {
// CustomAbort stops controller handler and show the error data, it's similar Aborts, but support status code and body. // CustomAbort stops controller handler and show the error data, it's similar Aborts, but support status code and body.
func (c *Controller) CustomAbort(status int, body string) { func (c *Controller) CustomAbort(status int, body string) {
c.Ctx.ResponseWriter.WriteHeader(status) c.Ctx.Output.Status = status
// first panic from ErrorMaps, is is user defined error functions. // first panic from ErrorMaps, is is user defined error functions.
if _, ok := ErrorMaps[body]; ok { if _, ok := ErrorMaps[body]; ok {
panic(body) panic(body)