1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/openssl/ossl_ssl.c: pass read_nonblock options to underlying IO

Browse Source 
when SSL session has not been started.

* test/openssl/test_ssl.rb: test for change.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44732 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tenderlove 2014-01-28 19:31:48 +00:00
parent 2ee916752c
commit e25f3587bd
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Wed Jan 29 04:29:54 2014 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/openssl/ossl_ssl.c: pass read_nonblock options to underlying IO
when SSL session has not been started.
* test/openssl/test_ssl.rb: test for change.
Wed Jan 29 03:49:36 2014 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/fiddle/closure.c: use sizeof(*pcl) for correct sizeof value.

4
ext/openssl/ossl_ssl.c
View File

@ -1431,8 +1431,12 @@ ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock)
else {
ID meth = nonblock ? rb_intern("read_nonblock") : rb_intern("sysread");
rb_warning("SSL session is not started yet.");
if (nonblock) {
return rb_funcall(ossl_ssl_get_io(self), meth, 3, len, str, opts);
} else {
return rb_funcall(ossl_ssl_get_io(self), meth, 2, len, str);
}
}
end:
rb_str_set_len(str, nread);

18
test/openssl/test_ssl.rb
View File

@ -169,6 +169,24 @@ class OpenSSL::TestSSL < OpenSSL::SSLTestCase
}
end
def test_read_nonblock_without_session
start_server(PORT, OpenSSL::SSL::VERIFY_NONE, false){|server, port|
sock = TCPSocket.new("127.0.0.1", port)
ssl = OpenSSL::SSL::SSLSocket.new(sock)
ssl.sync_close = true
OpenSSL::TestUtils.silent do
assert_equal :wait_readable, ssl.read_nonblock(100, exception: false)
ssl.write("abc\n")
IO.select [ssl]
assert_equal('a', ssl.read_nonblock(1))
assert_equal("bc\n", ssl.read_nonblock(100))
assert_equal :wait_readable, ssl.read_nonblock(100, exception: false)
end
ssl.close
}
end
def test_starttls
start_server(PORT, OpenSSL::SSL::VERIFY_NONE, false){|server, port|
sock = TCPSocket.new("127.0.0.1", port)