Skip to content

Copy 9.3 socket implementation to 9.2#6664

Merged
headius merged 6 commits intojruby:jruby-9.2from
headius:backport_socket
May 17, 2021
Merged

Copy 9.3 socket implementation to 9.2#6664
headius merged 6 commits intojruby:jruby-9.2from
headius:backport_socket

Conversation

@headius
Copy link
Member

@headius headius commented May 4, 2021

This is a wholesale duplication of the 9.3 (master at time of
writing) socket implementation into 9.2 to pick up all recent
improvements in the socket library.

This should address #6541 and other socket issues fixed on master.

@headius
Copy 9.3 socket implementation to 9.2
a908e44 
This is a wholesale duplication of the 9.3 (master at time of
writing) socket implementation into 9.2 to pick up all recent
improvements in the socket library.

This should address jruby#6541 and other socket issues fixed on master.
@headius headius added this to the JRuby 9.2.18.0 milestone May 4, 2021
@headius headius requested review from ahorek and enebo May 4, 2021 16:52
@headius
Copy link
Member Author

headius commented May 4, 2021

Ping @enebo and @ahorek to help evaluate this. No current schedule for 9.2.18 but this should be in the pipeline.

@headius headius mentioned this pull request May 4, 2021
Closed
@ahorek
Copy link
Contributor

ahorek commented May 4, 2021

hi @headius !

just a few notes:
backport related tests? headius#5
WDYT about https://github.com/jruby/jruby/pull/6401/files + your rework 1501bc7 ? it seems to be related to other changes.

ahorek
ahorek approved these changes May 4, 2021
View reviewed changes
Copy link
Contributor

@ahorek ahorek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@headius
Copy link
Member Author

headius commented May 17, 2021

@ahorek I merged in the tests. The one failure is a missing constant that I will investigate.

I will also look into the PR and commit you linked. Thanks!

@headius headius mentioned this pull request May 17, 2021
Merged
ahorek and others added 3 commits May 17, 2021 13:37
@ahorek @headius
define available constants
e13fbe7
@ahorek @headius
should be a constant
078510e
@headius
Ensure enums provided implement Constant
8e66a60 
Previously this was a blind case, followed by silently rejecting
non-Constant enums. Better to prevent improper use at the type
level.

See jruby#6401.
@headius
Copy link
Member Author

headius commented May 17, 2021

The one failure is a missing constant that I will investigate.

Actually it was a constant being defined on Linux that should not be, which is directly related to the other linked commits. I have cherrypicked the relevant changes to this branch.

@headius headius merged commit c79330a into jruby:jruby-9.2 May 17, 2021
@headius headius deleted the backport_socket branch May 17, 2021 19:12
@ahorek
Copy link
Contributor

ahorek commented May 17, 2021

Socket.const_defined? is often used as a feature check like this https://github.com/puma/puma/blob/master/lib/puma/server.rb#L123 and definition of constants that aren't actually available might break such code. That's why I think this should be backported together.

anyway, thank your for fixing it @headius

@ptribble ptribble mentioned this pull request Sep 29, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@enebo enebo Awaiting requested review from enebo

1 more reviewer

@ahorek ahorek ahorek approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

JRuby 9.2.18.0

Development

Successfully merging this pull request may close these issues.

2 participants

@headius @ahorek