Merge pull request #683 from chrisport/develop

beego/context: Fix ignored Header in case SetStatus has been called before

context/output.go

@@ -71,6 +71,14 @@ func (output *BeegoOutput) Body(content []byte) {
 	} else {
 		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)
 	switch output_writer.(type) {
 	case *gzip.Writer:
@@ -270,7 +278,6 @@ func (output *BeegoOutput) ContentType(ext string) {
 // SetStatus sets response status code.
 // It writes response header directly.
 func (output *BeegoOutput) SetStatus(status int) {
-	output.Context.ResponseWriter.WriteHeader(status)
 	output.Status = status
 }
 

router.go

@@ -762,6 +762,11 @@ Admin:
 			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) {