update

Author: admpub

context_x_response.go

@@ -349,6 +349,10 @@ func (c *XContext) NoContent(codes ...int) error {
 	if c.code == 0 {
 		c.code = http.StatusOK
 	}
+	err := c.preResponse()
+	if err != nil {
+		return err
+	}
 	c.response.WriteHeader(c.code)
 	return nil
 }

engine/fasthttp/response.go

@@ -180,16 +180,20 @@ func (r *Response) Stream(step func(context.Context, io.Writer) (bool, error)) e
 			defer tick.Stop()
 			defer cancel()
 			for {
-				<-tick.C
-				_, err := w.Write(ssePingBytes)
-				if err != nil {
-					r.logger.Debug(`SSE: `, err)
-					return
-				}
-				err = w.Flush()
-				if err != nil {
-					r.logger.Debug(`Flush: `, err)
+				select {
+				case <-ctx.Done():
 					return
+				case <-tick.C:
+					_, err := w.Write(ssePingBytes)
+					if err != nil {
+						r.logger.Debug(`SSE: `, err)
+						return
+					}
+					err = w.Flush()
+					if err != nil {
+						r.logger.Debug(`Flush: `, err)
+						return
+					}
 				}
 			}
 		}()
@@ -237,8 +241,8 @@ func (r *Response) Error(errMsg string, args ...int) {
 	} else {
 		r.status = fasthttp.StatusInternalServerError
 	}
-	r.Write(engine.Str2bytes(errMsg))
 	r.WriteHeader(r.status)
+	r.Write(engine.Str2bytes(errMsg))
 }
 
 func (r *Response) reset(req *Request, h engine.Header) {
@@ -249,6 +253,7 @@ func (r *Response) reset(req *Request, h engine.Header) {
 	r.committed = false
 	r.writer = req.context
 	r.stdResponseWriter = nil
+	r.logger = log.GetLogger("echo")
 }
 
 func (r *Response) StdResponseWriter() http.ResponseWriter {

engine/standard/response.go

@@ -57,9 +57,7 @@ func (r *Response) WriteHeader(code int) {
 		return
 	}
 	r.status = code
-	r.header.lock.Lock()
 	r.ResponseWriter.WriteHeader(code)
-	r.header.lock.Unlock()
 	r.committed = true
 }
 
@@ -112,8 +110,8 @@ func (r *Response) Error(errMsg string, args ...int) {
 	} else {
 		r.status = http.StatusInternalServerError
 	}
-	r.Write(engine.Str2bytes(errMsg))
 	r.WriteHeader(r.status)
+	r.Write(engine.Str2bytes(errMsg))
 }
 
 func (r *Response) reset(w http.ResponseWriter, req *http.Request, h *Header) {