Fix getting subnet of ipv4 mapped ipv6 addresses#29835
Merged
Conversation
Member
PVince81
commented
Nov 22, 2021
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
juliusknorr
reviewed
Nov 22, 2021
75fa96c to
266cc7c
Compare
come-nc
requested changes
Nov 22, 2021
Contributor
come-nc
left a comment
There was a problem hiding this comment.
Please fix the type declarations, it should please psalm as well.
juliusknorr
reviewed
Nov 22, 2021
juliusknorr
approved these changes
Nov 22, 2021
Member
juliusknorr
left a comment
There was a problem hiding this comment.
Looks good apart from the phpdoc issue that psalm has. LGTM once that is resolved
The subnet for an IPv4 address inside of IPv6 is now returned in its IPv4 form. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
266cc7c to
f01ad7b
Compare
come-nc
requested changes
Nov 22, 2021
Signed-off-by: Vincent Petry <vincent@nextcloud.com> Co-authored-by: Côme Chilliet <91878298+come-nc@users.noreply.github.com>
come-nc
approved these changes
Nov 23, 2021
Member
Author
|
failing test "log in with invalid user once fixed by admin" might be related: I'll investigate |
Member
Author
|
the test passes locally with docker, I wonder if it's timing related. |
Member
Author
|
/backport to stable23 |
Member
Author
|
/backport to stable22 |
Member
Author
|
/backport to stable21 |
This was referenced Nov 23, 2021
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.