fix(router) ensure rebuilds when Routes have 'regex_priority = nil' #4255
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
kong/runloop/handler.lua
Outdated
| @@ -110,10 +110,15 @@ do | |||
|
|
|||
| sort(routes, function(r1, r2) | |||
| r1, r2 = r1.route, r2.route | |||
| if r1.regex_priority == r2.regex_priority then | |||
|
|
|||
| local reg_prio1 = r1.regex_priority or 0 | |||
There was a problem hiding this comment.
Can regex_priority ever be ngx.null rather than nil?
There was a problem hiding this comment.
Not in the proxy, where we purposefully don't use the opts.nulls option.
thibaultcha
force-pushed
the
fix/router-rebuild-no-regex-priority
branch
from
4f73190 to
6d20106
Compare
If Routes have `regex_priority` properties mixed between numbers and nil (e.g. one Route was created with a default `regex_priority`, the other was created with a purposefully NULL `regex_priority`, the comparison in the router rebuild sorting of Routes would error out, because we are comparing one Route's `nil` value against another Route's `number`. Fix #4254
thibaultcha
force-pushed
the
fix/router-rebuild-no-regex-priority
branch
from
6d20106 to
33e96ac
Compare
kikito
approved these changes
Jan 29, 2019
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.
If Routes have
regex_priorityproperties mixed between numbers and nil(e.g. one Route was created with a default
regex_priority, the otherwas created with a purposefully NULL
regex_priority, the comparison inthe router rebuild sorting of Routes would error out, because we are
comparing one Route's
nilvalue against another Route'snumber.Fix #4254