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 289889a654 merge revision(s) 54258: [Backport #12182]
* ext/openssl/extconf.rb: check SSL_CTX_set_next_proto_select_cb
	  function rather than OPENSSL_NPN_NEGOTIATED macro. it exists
	  even if it is disabled by OpenSSL configuration.
	  [ruby-core:74384] [Bug #12182]

	* ext/openssl/ossl_ssl.c: update #ifdef(s) as above.

	* test/openssl/test_ssl.rb: skip NPN tests if NPN is disabled.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@54397 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-29 12:17:03 +00:00
..
-test- merge revision(s) 50305: [Backport #11065] 2015-05-21 04:38:14 +00:00
bigdecimal merge revision(s) 50860: [Backport #11249] 2015-07-07 04:37:55 +00:00
continuation
coverage * common.mk, ext/objspace/depend, ext/coverage/depend, 2013-10-28 03:43:17 +00:00
date merge revision(s) 50104,50105: [Backport #10906] 2015-11-18 11:57:07 +00:00
dbm ruby/ruby.h: RB_BLOCK_CALL_FUNC_ARGLIST 2013-11-29 07:59:14 +00:00
digest * ext/digest/sha1/sha1ossl.c: fixed build error introduced at r52797. 2015-12-01 04:07:10 +00:00
dl fix mistake of previous commit. 2015-12-16 12:28:27 +00:00
etc merge revision(s) r48360,r48364: [Backport #10493] 2015-02-02 13:58:21 +00:00
fcntl * lib/mkmf.rb: Add ruby/ruby.h, ruby/missing.h, ruby/intern.h, 2013-04-13 00:46:29 +00:00
fiber
fiddle merge revision(s): 53153 and 23405@ruby_1_9_1 2015-12-16 12:15:26 +00:00
gdbm ruby/ruby.h: RB_BLOCK_CALL_FUNC_ARGLIST 2013-11-29 07:59:14 +00:00
io merge revision(s) 50860: [Backport #11249] 2015-07-07 04:37:55 +00:00
json merge revision(s) r44577,r45097,r45330,r45331,r45354,r45356: [Backport #10033] 2014-08-02 15:25:17 +00:00
mathn
nkf * remove trailing spaces. 2013-11-22 05:21:06 +00:00
objspace merge revision(s) 50982,50983: [Backport #11291] 2015-06-29 04:28:15 +00:00
openssl merge revision(s) 54258: [Backport #12182] 2016-03-29 12:17:03 +00:00
pathname merge revision(s) r47591: [Backport #10242] 2014-09-15 14:11:00 +00:00
psych merge revision(s) r45453,r45455,r45577: [Backport #9798] 2014-05-04 15:45:33 +00:00
pty merge revision(s) 49776: [Backport #9144] 2015-05-21 00:47:11 +00:00
racc/cparse merge revision(s) 44579: [Backport #9500] 2014-02-10 13:35:07 +00:00
rbconfig/sizeof ext/rbconfig/sizeof: move to an extension library 2013-11-18 14:19:16 +00:00
readline merge revision(s) 52795: [Backport #11751] 2015-12-02 06:14:40 +00:00
ripper merge revision(s) 44878,44879: [Backport #9483] 2014-02-22 06:06:55 +00:00
sdbm merge revision(s) r49490,r49494: [Backport #10825] 2015-03-17 16:59:08 +00:00
socket merge revision(s) 53677: [Backport #11877] 2016-02-25 10:58:02 +00:00
stringio merge revision(s) 53435: [Backport #11945] 2016-02-25 09:23:15 +00:00
strscan merge revision(s) 44572,44578,44591,44592: [Backport #9490] 2014-02-10 11:45:14 +00:00
syslog merge revision(s) 44579: [Backport #9500] 2014-02-10 13:35:07 +00:00
thread merge revision(s) r44681: [Backport #9440] 2015-03-21 19:35:06 +00:00
tk merge revision(s) 54022: [Backport #11893] 2016-03-25 09:35:13 +00:00
win32 merge revision(s) 51575,51584: [Backport #11439] 2015-08-17 14:27:58 +00:00
win32ole merge revision(s) r47153: [Backport #10127] 2014-08-30 16:09:10 +00:00
zlib merge revision(s) 50834: [Backport #11221] 2015-07-07 04:40:09 +00:00
.document * ext/.document: Remove curses from documentable directories. 2013-12-09 21:16:19 +00:00
extmk.rb extmk.rb: static extensions 2013-07-28 11:10:52 +00:00
Setup * ext/curses, sample/curses: removed curses. 2013-12-09 04:39:49 +00:00
Setup.atheos * ext/curses, sample/curses: removed curses. 2013-12-09 04:39:49 +00:00
Setup.emx * ext/curses, sample/curses: removed curses. 2013-12-09 04:39:49 +00:00
Setup.nacl * ext/curses, sample/curses: removed curses. 2013-12-09 04:39:49 +00:00
Setup.nt * ext/curses, sample/curses: removed curses. 2013-12-09 04:39:49 +00:00