From dc0253b0637bbf367ad330612900e780c6b2b0e6 Mon Sep 17 00:00:00 2001 From: KN4CK3R Date: Thu, 25 Aug 2022 18:05:21 +0200 Subject: Replace `ServeStream` with `ServeContent` (#20903) * Replace ServeStream with ServeContent. * Update modules/timeutil/timestamp.go Co-authored-by: delvh Co-authored-by: delvh Co-authored-by: Lunny Xiao Co-authored-by: techknowlogick --- modules/context/context.go | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'modules/context') diff --git a/modules/context/context.go b/modules/context/context.go index 0b9898acef..45f1978e97 100644 --- a/modules/context/context.go +++ b/modules/context/context.go @@ -358,14 +358,7 @@ func (ctx *Context) SetServeHeaders(filename string) { } // ServeContent serves content to http request -func (ctx *Context) ServeContent(name string, r io.ReadSeeker, params ...interface{}) { - modTime := time.Now() - for _, p := range params { - switch v := p.(type) { - case time.Time: - modTime = v - } - } +func (ctx *Context) ServeContent(name string, r io.ReadSeeker, modTime time.Time) { ctx.SetServeHeaders(name) http.ServeContent(ctx.Resp, ctx.Req, name, modTime, r) } @@ -382,15 +375,6 @@ func (ctx *Context) ServeFile(file string, names ...string) { http.ServeFile(ctx.Resp, ctx.Req, file) } -// ServeStream serves file via io stream -func (ctx *Context) ServeStream(rd io.Reader, name string) { - ctx.SetServeHeaders(name) - _, err := io.Copy(ctx.Resp, rd) - if err != nil { - ctx.ServerError("Download file failed", err) - } -} - // UploadStream returns the request body or the first form file // Only form files need to get closed. func (ctx *Context) UploadStream() (rd io.ReadCloser, needToClose bool, err error) { -- cgit v1.2.3