tenkuma/forgejo-pages
tenkuma/forgejo-pages
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

close api response body

Browse source
This commit is contained in:
Ronmi Ren 2025-01-07 21:41:32 +08:00
commit 1b5ab5659d
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/get_file.go
View file

@ -25,7 +25,7 @@ type Info struct {
var ErrNotFound = errors.New("404 not found") var ErrNotFound = errors.New("404 not found")
func (f *Forgejo) getFile(ctx context.Context, user, repo, branch, file string) (info Info, content io.Reader, err error) { func (f *Forgejo) getFile(ctx context.Context, user, repo, branch, file string) (info Info, content io.ReadCloser, err error) {
u := f.Server u := f.Server
u.Path = "/api/v1/repos/" + user + "/" + repo + "/raw/" + file u.Path = "/api/v1/repos/" + user + "/" + repo + "/raw/" + file
p := u.Query() p := u.Query()
@ -55,7 +55,7 @@ func (f *Forgejo) getFile(ctx context.Context, user, repo, branch, file string)
return return
} }
func (f *Forgejo) GetFile(ctx context.Context, user, repo, branch, file string) (info Info, content io.Reader, err error) { func (f *Forgejo) GetFile(ctx context.Context, user, repo, branch, file string) (info Info, content io.ReadCloser, err error) {
info, content, err = f.getFile(ctx, user, repo, branch, file) info, content, err = f.getFile(ctx, user, repo, branch, file)
if err != nil { if err != nil {
return return
@ -67,6 +67,7 @@ func (f *Forgejo) GetFile(ctx context.Context, user, repo, branch, file string)
if err != nil { if err != nil {
return return
} }
content.Close()
if bytes.HasPrefix(data, []byte("/")) { if bytes.HasPrefix(data, []byte("/")) {
err = ErrNotFound err = ErrNotFound
return return

1
lib/web.go
View file

@ -49,6 +49,7 @@ func (f *Forgejo) handle(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusNotFound) w.WriteHeader(http.StatusNotFound)
return return
} }
defer content.Close()
trySet(w.Header(), "Etag", info.ETag) trySet(w.Header(), "Etag", info.ETag)
trySet(w.Header(), "Last-Modified", info.LastModified) trySet(w.Header(), "Last-Modified", info.LastModified)