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

Run tests on TruffleRuby, all tests pass now #2198

Merged
merged 15 commits into from Mar 24, 2020
Merged

Run tests on TruffleRuby, all tests pass now #2198

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e804787
Support skip_on :truffleruby
eregon Mar 22, 2020
8b060d9
Remove unused variable declaration
eregon Mar 22, 2020
f7f1f0c
Properly skip tests which need fork
eregon Mar 22, 2020
4069ec8
Improve NO_FORK_MSG
eregon Mar 22, 2020
2c8a1e4
Keep the Tempfile instances alive in test_redirect_io.rb
eregon Mar 22, 2020
5166a47
Use a better way to find a free port
eregon Mar 22, 2020
e461d1e
Read directly from the socket in #read_and_drop
eregon Mar 22, 2020
e9ce579
TruffleRuby should pass the CI now, remove from allowed failures
eregon Mar 22, 2020
4ed3e53
Use a timeout of 120 for all non-MRI implementations
eregon Mar 22, 2020
e3706b5
Fix check for cluster mode in integration tests
eregon Mar 22, 2020
63d3fc2
Improve integration tests to fail more clearly if the pid file does n…
eregon Mar 22, 2020
2285288
Make integration tests more robust
eregon Mar 22, 2020
d7c5cc2
Add skips for unreliable or racy tests
eregon Mar 22, 2020
ae98fa9
Add ChangeLog entry
eregon Mar 23, 2020
646d73a
No need to run RuboCop on non-MRI implementations
eregon Mar 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 8 additions & 5 deletions lib/puma/minissl.rb
View file
Open in desktop
Expand Up @@ -125,11 +125,14 @@ def flush

def read_and_drop(timeout = 1)
return :timeout unless IO.select([@socket], nil, nil, timeout)
return :eof unless read_nonblock(1024)
:drop
rescue Errno::EAGAIN
# do nothing
:eagain
case @socket.read_nonblock(1024, exception: false)
when nil
:eof
when :wait_readable
:eagain
else
:drop
end
Copy link
Contributor Author

Choose a reason for hiding this comment

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

For the record, this might be related to a bug in OpenSSL, mentioned in ruby/openssl#355 (comment)
Anyway, it seems safer to not call to SSL anymore if we are in such a state, as this commit does.

end

def should_drop_bytes?
Expand Down