1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
ruby--ruby/ext
usa c2fdfb05a4 merge 3af2635f11
patched by Kazuki Yamaguchi <k@rhe.jp>

	bio: prevent possible GC issue in ossl_obj2bio()

	Prevent the new object created by StringValue() from being GCed.
	Luckily, as none of the callers of ossl_obj2bio() reads from the
	returned BIO after possible triggering GC, this has not been a real
	problem.

	As a bonus, ossl_protect_obj2bio() function which is no longer used
	anywhere is removed.

	merge f842b0d5c5
	patched by Kazuki Yamaguchi <k@rhe.jp>

	bio: do not use the FILE BIO method in ossl_obj2bio()

	Read everything from an IO object into a String first and use the
	memory buffer BIO method just as we do for String inputs.

	For MSVC builds, the FILE BIO method uses the "UPLINK" interface that
	requires the application to provide OPENSSL_Applink() function. For us,
	the "application" means ruby.exe, in which we can't do anything. As a
	workaround, avoid using the FILE BIO method at all.

	Usually private keys or X.509 certificates aren't that large and the
	temporarily increased memory usage hopefully won't be an issue.

	ext/openssl/ossl_version.h (OpenSSL::VERSION): bump to 1.1.1.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@62885 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-03-22 03:33:56 +00:00
..
-test- merge revision(s) 56558,59116,59136: [Backport #12670] 2017-06-30 12:35:49 +00:00
bigdecimal merge revision(s) 60071: [Backport #13953] [Backport #13954] [Backport #13955] [Backport #13957] 2018-01-31 13:38:59 +00:00
cgi/escape escape.c: should not freeze 2015-12-22 05:31:31 +00:00
continuation
coverage merge revision(s) 54465: [Backport #12237] 2016-04-18 08:00:38 +00:00
date merge revision(s) 58020: [Backport #10936] 2018-01-31 11:10:20 +00:00
dbm
digest merge revision(s) 55523: [Backport #12524] 2016-08-16 03:13:24 +00:00
etc merge revision(s) 60071: [Backport #13953] [Backport #13954] [Backport #13955] [Backport #13957] 2018-01-31 13:38:59 +00:00
fcntl
fiber
fiddle
gdbm merge revision(s) 60071: [Backport #13953] [Backport #13954] [Backport #13955] [Backport #13957] 2018-01-31 13:38:59 +00:00
io merge revision(s) 57280,57282: [Backport #13112] 2017-03-27 14:35:49 +00:00
json * ext/json: bump to version 1.8.3.1. [Backport #13853] 2017-09-09 13:58:58 +00:00
mathn
nkf merge revision(s) 60071: [Backport #13953] [Backport #13954] [Backport #13955] [Backport #13957] 2018-01-31 13:38:59 +00:00
objspace
openssl merge 3af2635f11 2018-03-22 03:33:56 +00:00
pathname merge revision(s) 59102: [Backport #13515] 2017-06-30 13:01:26 +00:00
psych merge revision(s) 60071: [Backport #13953] [Backport #13954] [Backport #13955] [Backport #13957] 2018-01-31 13:38:59 +00:00
pty
racc/cparse
rbconfig/sizeof
readline merge revision(s) 60071: [Backport #13953] [Backport #13954] [Backport #13955] [Backport #13957] 2018-01-31 13:38:59 +00:00
ripper merge revision(s) 58545,58584: [Backport #13536] 2017-06-30 10:30:56 +00:00
sdbm
socket merge revision(s) 55797: [Backport #12645] 2016-08-18 14:26:36 +00:00
stringio merge revision(s) 58057: [Backport #13353] 2017-03-27 15:51:02 +00:00
strscan merge revision(s) 59384: [Backport #13759] 2017-08-09 10:30:58 +00:00
syslog merge revision(s) 60071: [Backport #13953] [Backport #13954] [Backport #13955] [Backport #13957] 2018-01-31 13:38:59 +00:00
thread
tk merge revision(s) 54022: [Backport #11893] 2016-03-29 06:05:18 +00:00
win32 merge revision(s) 57265,57266: [Backport #13081] 2017-03-27 16:15:52 +00:00
win32ole merge revision(s) 53322,53323: [Backport #11880] 2016-05-05 17:28:45 +00:00
zlib merge revision(s) 59333,59337: [Backport #13616] 2017-08-09 08:08:01 +00:00
.document
extmk.rb merge revision(s) 55434: [Backport #12401] 2016-08-11 19:26:43 +00:00
Setup cgi/escape: Optimize CGI.escapeHTML 2015-12-20 11:54:54 +00:00
Setup.atheos cgi/escape: Optimize CGI.escapeHTML 2015-12-20 11:54:54 +00:00
Setup.nacl cgi/escape: Optimize CGI.escapeHTML 2015-12-20 11:54:54 +00:00
Setup.nt cgi/escape: Optimize CGI.escapeHTML 2015-12-20 11:54:54 +00:00