WriteHeader should be called before Write not after.

The header should be written before the first write.

Fixes http: superfluous response.WriteHeader call from code.gitea.io/gitea/modules/context.(*Response).WriteHeader (response.go:67)

Signed-off-by: Andrew Thornton <[email protected]>

Author: zeripath

modules/context/response.go

@@ -43,14 +43,14 @@ func (r *Response) Write(bs []byte) (int, error) {
 		}
 		r.beforeExecuted = true
 	}
+	if r.status == 0 {
+		r.WriteHeader(200)
+	}
 	size, err := r.ResponseWriter.Write(bs)
 	r.written += size
 	if err != nil {
 		return size, err
 	}
-	if r.status == 0 {
-		r.WriteHeader(200)
-	}
 	return size, nil
 }
 

routers/repo/attachment.go

@@ -92,6 +92,7 @@ func DeleteAttachment(ctx *context.Context) {
 
 // GetAttachment serve attachements
 func GetAttachment(ctx *context.Context) {
+	log.Info("GetAttachment(%s)", ctx.Params(":uuid"))
 	attach, err := models.GetAttachmentByUUID(ctx.Params(":uuid"))
 	if err != nil {
 		if models.IsErrAttachmentNotExist(err) {
@@ -156,4 +157,6 @@ func GetAttachment(ctx *context.Context) {
 		ctx.ServerError("ServeData", err)
 		return
 	}
+	log.Info("GetAttachment(%s) Done", ctx.Params(":uuid"))
+
 }

routers/repo/download.go

@@ -32,6 +32,7 @@ func ServeData(ctx *context.Context, name string, size int64, reader io.Reader)
 	if n >= 0 {
 		buf = buf[:n]
 	}
+	log.Info("ServeData(%s)", name)
 
 	ctx.Resp.Header().Set("Cache-Control", "public,max-age=86400")
 
@@ -71,10 +72,14 @@ func ServeData(ctx *context.Context, name string, size int64, reader io.Reader)
 		}
 	}
 
+	log.Info("ServeData(%s) Header done", name)
+
 	_, err = ctx.Resp.Write(buf)
 	if err != nil {
 		return err
 	}
+	log.Info("ServeData(%s) buffer done", name)
+
 	_, err = io.Copy(ctx.Resp, reader)
 	return err
 }