Fix issue with custom error handler on bad request #1351
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eguzki
approved these changes
Oct 4, 2017
olleolleolle
approved these changes
Oct 10, 2017
|
#1339 candidate? |
|
@zzak I think this fits a patch release. Include it! |
|
I agree, this is a backwards compatible bug fix 👍 |
namusyaka
approved these changes
Feb 6, 2018
lib/sinatra/base.rb
Outdated
| @@ -1086,7 +1087,7 @@ def invoke | |||
|
|
|||
| # Dispatch a request with error handling. | |||
| def dispatch! | |||
| force_encoding(@params = IndifferentHash[@request.params]) | |||
| force_encoding(@params = @params.merge(@request.params)) | |||
There was a problem hiding this comment.
Is there any reason to not use the merge! method? It would be something like:
force_encoding(@params.merge!(@request.params))There was a problem hiding this comment.
Good point, I'll make that update 👍
|
Good. Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Make sure
@paramsare initialized for an app, so that they exist if processing a request with a custom error handler. Currently if params are invalid an error is raised before@paramsis set, causing aNoMethodErrorfornil:NilClassdown the chain. Fixes #1350.