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.

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

Add ssl support to Windows builds, Appveyor #1439

Merged
merged 1 commit into from Oct 16, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
73 changes: 57 additions & 16 deletions appveyor.yml
@@ -1,29 +1,70 @@
init:
- set PATH=C:\ruby%ruby_version%\bin;C:\Program Files\7-Zip;C:\Program Files\AppVeyor\BuildAgent;C:\Program Files\Git\cmd;C:\Windows\system32
- if %ruby_version%==_trunk (
appveyor DownloadFile https://ci.appveyor.com/api/projects/MSP-Greg/ruby-loco/artifacts/ruby_trunk.7z -FileName C:\ruby_trunk.7z &
7z x C:\ruby_trunk.7z -oC:\ruby_trunk &
C:\ruby_trunk\trunk_pkgs.cmd
)

install:
- set PATH=C:\MinGW\bin;C:\Ruby%ruby_version%\bin;%PATH%
- set RAKEOPT=-rdevkit
- set DISABLE_SSL=true
- set APPVEYOR=true
# Download RI OpenSSL Knapsack package
# RI DevKit is only installed in Ruby23 and Ruby23-x64 folders
# RI2 MSYS2/MinGW OpenSSL package is standard Appveyor item
- if "%ri_file%"=="x86" (
appveyor DownloadFile https://dl.bintray.com/oneclick/OpenKnapsack/x86/openssl-1.0.2j-x86-windows.tar.lzma &
7z e openssl-1.0.2j-x86-windows.tar.lzma &
7z x -y openssl-1.0.2j-x86-windows.tar -oC:\ruby23\DevKit\mingw &
set b_config="--with-ssl-dir=C:/ruby23/DevKit/mingw --with-opt-include=C:/ruby23/DevKit/mingw/include" &
set SSL_CERT_FILE=C:/ruby24-x64/ssl/cert.pem
)
- if "%ri_file%"=="x64" (
appveyor DownloadFile https://dl.bintray.com/oneclick/OpenKnapsack/x64/openssl-1.0.2j-x64-windows.tar.lzma &
7z e openssl-1.0.2j-x64-windows.tar.lzma &
7z x -y openssl-1.0.2j-x64-windows.tar -oC:\ruby23-x64\DevKit\mingw &
set b_config="--with-ssl-dir=C:/ruby23-x64/DevKit/mingw --with-opt-include=C:/ruby23-x64/DevKit/mingw/include" &
set SSL_CERT_FILE=C:/ruby24-x64/ssl/cert.pem
)
- RAKEOPT:
- APPVEYOR: true
- ruby --version
- gem --version
- bundle --version
- bundle install
- bundle install --without documentation --path av_bundle/%ruby_version%

build_script:
- bundle exec rake -rdevkit compile -- %b_config%

test_script:
- bundle exec rake
- set OPENSSL_DIR=
- bundle exec rake -rdevkit test TESTOPTS="--verbose"

on_finish:
- ruby -v

environment:
matrix:
- ruby_version: "24"
- ruby_version: "24-x64"
- ruby_version: "23"
- ruby_version: "23-x64"
- ruby_version: "22"
- ruby_version: "22-x64"
- ruby_version: "21"
- ruby_version: "21-x64"
- ruby_version: _trunk
b_config: "--use-system-libraries"
- ruby_version: 24
b_config: "--use-system-libraries"
- ruby_version: 24-x64
b_config: "--use-system-libraries"
- ruby_version: 23
ri_file: x86
- ruby_version: 23-x64
ri_file: x64
- ruby_version: 22
ri_file: x86
- ruby_version: 22-x64
ri_file: x64
- ruby_version: 21
DISABLE_SSL: true
- ruby_version: 21-x64
DISABLE_SSL: true

cache:
- av_bundle

branches:
only:
- master

build: off
5 changes: 5 additions & 0 deletions ext/puma_http11/mini_ssl.c
Expand Up @@ -411,6 +411,11 @@ VALUE noop(VALUE self) {
void Init_mini_ssl(VALUE puma) {
VALUE mod, eng;

/* Fake operation for documentation (RDoc, YARD) */
#if 0 == 1
puma = rb_define_module("Puma");
#endif

SSL_library_init();
OpenSSL_add_ssl_algorithms();
SSL_load_error_strings();
Expand Down
14 changes: 13 additions & 1 deletion lib/puma/minissl.rb
Expand Up @@ -43,7 +43,19 @@ def read_nonblock(size, *_)
output = engine_read_all
return output if output

data = @socket.read_nonblock(size)
if /mswin|mingw/ !~ RUBY_PLATFORM
data = @socket.read_nonblock(size)
else
begin
data = @socket.read_nonblock(size)
rescue IO::WaitReadable
IO.select([@socket.to_io])
retry
rescue IO::WaitWritable
IO.select(nil, [@socket.to_io])
retry
end
end
Copy link
Contributor

Choose a reason for hiding this comment

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

This method name is #read_nonblock, shouldn't we raise Errno::EAGAIN rather than blocking?

It should be the callers responsibility to retry.

Copy link
Member Author

Choose a reason for hiding this comment

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

Maybe have a look at 7165775?

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't recall. Since the error is handled in read_and_drop, if the change works,...


@engine.inject(data)
output = engine_read_all
Expand Down