mirror of
https://github.com/astaxie/beego.git
synced 2024-11-22 13:10:54 +00:00
accept asta's idea see the talk
https://github.com/astaxie/beego/pull/1719
This commit is contained in:
parent
b30ce768f8
commit
9a2696d216
@ -175,16 +175,14 @@ func (ctx *Context) CheckXSRFCookie() bool {
|
||||
//started set to true if response was written to then don't execute other handler
|
||||
type Response struct {
|
||||
http.ResponseWriter
|
||||
Started bool
|
||||
Status int
|
||||
wroteHeader bool
|
||||
Started bool
|
||||
Status int
|
||||
}
|
||||
|
||||
func (r *Response) reset(rw http.ResponseWriter) {
|
||||
r.ResponseWriter = rw
|
||||
r.Status = 0
|
||||
r.Started = false
|
||||
r.wroteHeader = false
|
||||
}
|
||||
|
||||
// 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.
|
||||
func (w *Response) Write(p []byte) (int, error) {
|
||||
w.Started = true
|
||||
if !w.wroteHeader {
|
||||
w.ResponseWriter.WriteHeader(w.Status)
|
||||
//prevent multiple response.WriteHeader calls
|
||||
w.wroteHeader = true
|
||||
}
|
||||
return w.ResponseWriter.Write(p)
|
||||
}
|
||||
|
||||
@ -204,10 +197,12 @@ func (w *Response) Write(p []byte) (int, error) {
|
||||
// and sets `started` to true.
|
||||
func (w *Response) WriteHeader(code int) {
|
||||
if w.Status > 0 {
|
||||
//prevent multiple response.WriteHeader calls
|
||||
return
|
||||
}
|
||||
w.Status = code
|
||||
w.Started = true
|
||||
w.ResponseWriter.WriteHeader(w.Status)
|
||||
}
|
||||
|
||||
// Hijack hijacker for http
|
||||
|
@ -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.
|
||||
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.
|
||||
if _, ok := ErrorMaps[body]; ok {
|
||||
panic(body)
|
||||
|
Loading…
Reference in New Issue
Block a user