Merge pull request #4068 from milosgajdos/2_8-dont-close-request-body

[release/2.8] Do not close HTTP request body in HTTP handler
distribution · Sep 23, 2023 · 1eb2c30 · 1eb2c30
2 parents 2b76378 + 5e6b1b5
commit 1eb2c30
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/registry/handlers/app.go b/registry/handlers/app.go
@@ -620,8 +620,6 @@ func (app *App) configureSecret(configuration *configuration.Configuration) {
 }
 
 func (app *App) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	defer r.Body.Close() // ensure that request body is always closed.
-
 	// Prepare the context with our own little decorations.
 	ctx := r.Context()
 	ctx = dcontext.WithRequest(ctx, r)

diff --git a/registry/handlers/tags.go b/registry/handlers/tags.go
@@ -33,8 +33,6 @@ type tagsAPIResponse struct {
 
 // GetTags returns a json list of tags for a specific image name.
 func (th *tagsHandler) GetTags(w http.ResponseWriter, r *http.Request) {
-	defer r.Body.Close()
-
 	tagService := th.Repository.Tags(th)
 	tags, err := tagService.All(th)
 	if err != nil {