archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-19 02:23:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) 51016,53329: [Backport #11885]

Browse source 
* ext/openssl/ossl_ssl.c (ossl_ssl_read_internal):
	  do not process kwargs in blocking mode

	* test/openssl/test_ssl.rb: test sysread

	* io.c (io_getpartial): remove unused kwarg from template

	* test/ruby/test_io.rb (test_readpartial_bad_args): new
	  [Bug #11885]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54045 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2016-03-08 20:27:01 +00:00
parent e23a564ac6
commit 83d705f6a0
5 changed files with 35 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
io.c
View file

@ -2675,8 +2675,10 @@ io_read_nonblock(int argc, VALUE *argv, VALUE io)
rb_scan_args(argc, argv, "11:", NULL, NULL, &opts);
if (!NIL_P(opts) && Qfalse == get_kwargs_exception(opts))
if (!NIL_P(opts) && Qfalse == get_kwargs_exception(opts)) {
no_exception = 1;
argc--;
}
ret = io_getpartial(argc, argv, io, 1, no_exception);