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

Fix Puma::StateFile#load incompatibility #2810

Merged
merged 3 commits into from
Jan 27, 2022
Merged

Fix Puma::StateFile#load incompatibility #2810

merged 3 commits into from
Jan 27, 2022

Conversation

kzkn
Copy link
Contributor

@kzkn kzkn commented Jan 27, 2022 •
edited

Description

Until 5.5.2, empty values were read as nil.
Since 5.6.0, empty values are read as "".
This PR fixes the incompatibility.

This incompatibility affects here for example.

Your checklist for this pull request

  • I have reviewed the guidelines for contributing to this repository.
  • I have added (or updated) appropriate tests if this PR fixes a bug or adds a feature.
  • My pull request is 100 lines added/removed or less so that it can be easily reviewed.
  • If this PR doesn't need tests (docs change), I added [ci skip] to the title of the PR.
  • If this closes any issues, I have added "Closes #issue" to the PR description or my commit messages.
  • I have updated the documentation accordingly.
  • All new and existing tests passed, including Rubocop.

@kzkn
Fix Puma::StateFile#load incompatibility
e5c7f05 
Until 5.5.2, empty values were read as `nil`.
Since 5.6.0, empty values are read as `""`.

This commit fixes the incompatibility introduced in 5.6.0.
@MSP-Greg MSP-Greg added the bug label Jan 27, 2022
@MSP-Greg
Copy link
Member

@kzkn

Thanks.

Pounding head against desk...

I'm sorry for the bug, as I introduced it. Locally, I've always used scripts that worked on Windows & Ubuntu, and Windows doesn't really support signals. Hence, I had no nil values in state files.

@MSP-Greg MSP-Greg merged commit 93815b2 into puma:master Jan 27, 2022
@kzkn kzkn deleted the fix-state-file-load branch January 27, 2022 23:56
@JunichiIto
Copy link

@MSP-Greg Hello. I'm waiting for the release of this patch. Is there any schedule for it?

@nateberkopec
Copy link
Member

My bad. We're gonna push 6.0 soon but I'll do a 5.6.5 bugfix release as well.

MSP-Greg pushed a commit to MSP-Greg/puma that referenced this pull request Apr 2, 2022
@kzkn @MSP-Greg
Fix Puma::StateFile#load returns empty string instead of nil (puma#…
68fc1ba 
…2810)

Bug introduced in 2b6968f puma#2784

Until 5.5.2, empty values were read as `nil`.
Since 5.6.0, empty values are read as `""`.
MSP-Greg pushed a commit to MSP-Greg/puma that referenced this pull request Apr 3, 2022
@kzkn @MSP-Greg
Fix Puma::StateFile#load returns empty string instead of nil (puma#…
adc94f4 
…2810)

Bug introduced in 2b6968f puma#2784

Until 5.5.2, empty values were read as `nil`.
Since 5.6.0, empty values are read as `""`.
@JunichiIto
Copy link

@nateberkopec I'm sorry to bother you, but do you think it will take much longer to release 5.6.5?

@nateberkopec
Copy link
Member

Sorry, been busy with kid and job. I hope to start doing some releases this week.

@JunichiIto
Copy link

@nateberkopec Thank you for your update. I look forward to the release.

@shunichi
Copy link

@nateberkopec Could you release 5.6.5?

I want to update puma because of CVE-2022-24790, but this incompatibility is a blocker.

https://www.cvedetails.com/cve/CVE-2022-24790/

nateberkopec pushed a commit that referenced this pull request Aug 22, 2022
@kzkn @nateberkopec
Fix Puma::StateFile#load returns empty string instead of nil (#2810)
c36d644 
Bug introduced in 2b6968f #2784

Until 5.5.2, empty values were read as `nil`.
Since 5.6.0, empty values are read as `""`.
@nateberkopec
Copy link
Member

5.6.5 has been released!

@JunichiIto
Copy link

Great, thank you @nateberkopec !

JuanitoFatas pushed a commit to JuanitoFatas/puma that referenced this pull request Sep 9, 2022
@kzkn @JuanitoFatas
Fix Puma::StateFile#load returns empty string instead of nil (puma#…
95874f7 
…2810)

Bug introduced in 2b6968f puma#2784

Until 5.5.2, empty values were read as `nil`.
Since 5.6.0, empty values are read as `""`.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@kzkn @MSP-Greg @JunichiIto @nateberkopec @shunichi