Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

5.6.2 #2821

Merged
merged 2 commits into from Feb 11, 2022
Merged

5.6.2 #2821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3acff5
Ensure `close` is called on the response body no matter what
byroot Feb 11, 2022
502422e
5.6.2
nateberkopec Feb 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions History.md
View file
Open in desktop
@@ -1,3 +1,8 @@
## 5.6.2 / 2022-02-11

* Bugfix/Security
* Response body will always be `close`d. (GHSA-rmj8-8hhh-gv5h, related to [#2809])

## 5.6.1 / 2022-01-26

* Bugfixes
Expand Down
2 changes: 1 addition & 1 deletion lib/puma/const.rb
View file
Open in desktop
Expand Up @@ -100,7 +100,7 @@ class UnsupportedOption < RuntimeError
# too taxing on performance.
module Const

PUMA_VERSION = VERSION = "5.6.1".freeze
PUMA_VERSION = VERSION = "5.6.2".freeze
CODE_NAME = "Birdie's Version".freeze

PUMA_SERVER_STRING = ['puma', PUMA_VERSION, CODE_NAME].join(' ').freeze
Expand Down
15 changes: 10 additions & 5 deletions lib/puma/request.rb
View file
Open in desktop
Expand Up @@ -167,11 +167,16 @@ def handle_request(client, lines, requests)
end

ensure
uncork_socket io

body.close
client.tempfile.unlink if client.tempfile
res_body.close if res_body.respond_to? :close
begin
uncork_socket io

body.close
client.tempfile.unlink if client.tempfile
ensure
# Whatever happens, we MUST call `close` on the response body.
# Otherwise Rack::BodyProxy callbacks may not fire and lead to various state leaks
res_body.close if res_body.respond_to? :close
end

after_reply.each { |o| o.call }
end
Expand Down