Skip to content

Commit d7cb63a

Browse files
committed
Imported Upstream version 2.2.4
1 parent f647861 commit d7cb63a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+1230
-219
lines changed

ChangeLog

Lines changed: 386 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,389 @@
1+
Wed Dec 16 21:10:19 2015 CHIKANAGA Tomoyuki <[email protected]>
2+
3+
* ext/fiddle/handle.c: check tainted string arguments.
4+
Patch provided by tenderlove and nobu.
5+
6+
* test/fiddle/test_handle.rb (class TestHandle): add test for above.
7+
8+
9+
Wed Dec 16 02:38:19 2015 Nobuyoshi Nakada <[email protected]>
10+
11+
* io.c (parse_mode_enc): fix buffer overflow.
12+
13+
Sat Dec 12 17:19:27 2015 CHIKANAGA Tomoyuki <[email protected]>
14+
15+
* doc/NEWS-0.2.2: add description about incompatible change in Hash
16+
duplicated key overriding policy. [Bug #10315] [Bug #11501]
17+
18+
Fri Dec 11 22:41:15 2015 Eric Wong <[email protected]>
19+
20+
* insns.def (opt_case_dispatch): avoid converting Infinity
21+
* test/ruby/test_optimization.rb (test_opt_case_dispatch_inf): new
22+
[ruby-dev:49423] [Bug #11804]'
23+
24+
Thu Dec 10 00:23:07 2015 Rei Odaira <[email protected]>
25+
26+
* configure.in: pthread_getattr_np is broken on AIX.
27+
More specifically, the stack address and size returned are
28+
not correct.
29+
30+
Thu Dec 10 00:19:18 2015 NAKAMURA Usaku <[email protected]>
31+
32+
* common.mk (update-gems): use BASERUBY instead of RUNRUBY.
33+
34+
Wed Dec 9 01:49:13 2015 Eric Wong <[email protected]>
35+
36+
* insns.def (opt_case_dispatch): check Float#=== redefinition
37+
* test/ruby/test_optimization.rb (test_opt_case_dispatch): new
38+
[ruby-core:71920] [Bug #11784]
39+
40+
Wed Dec 9 01:46:23 2015 Nobuyoshi Nakada <[email protected]>
41+
42+
* ruby_atomic.h (ATOMIC_SIZE_CAS): fix the argument order of
43+
InterlockedCompareExchange64. new value and then old value is
44+
the last.
45+
46+
Wed Dec 9 01:28:54 2015 Nobuyoshi Nakada <[email protected]>
47+
48+
* encoding.c (enc_m_loader): defer finding encoding object not to
49+
be infected by marshal source. [ruby-core:71793] [Bug #11760]
50+
51+
* marshal.c (r_object0): enable compatible loader on USERDEF
52+
class. the loader function is called with the class itself,
53+
instead of an allocated object, and the loaded data.
54+
55+
* marshal.c (compat_allocator_table): initialize
56+
compat_allocator_tbl on demand.
57+
58+
* object.c (rb_undefined_alloc): extract from rb_obj_alloc.
59+
60+
Wed Dec 9 01:24:57 2015 Rei Odaira <[email protected]>
61+
62+
* ext/-test-/file/fs.c: need to include sys/statvfs.h
63+
to use statvfs().
64+
65+
* ext/-test-/file/extconf.rb: check the existence of
66+
sys/statvfs.h
67+
68+
Fri Dec 4 04:46:33 2015 Nobuyoshi Nakada <[email protected]>
69+
70+
* sprintf.c (rb_str_format): fix wrong shifting position in
71+
Rational conversion when not at the beginning of the result.
72+
[ruby-core:71806] [Bug #11766]
73+
74+
Fri Dec 4 02:42:37 2015 Nobuyoshi Nakada <[email protected]>
75+
76+
* range.c (range_to_s): should be infected by the receiver.
77+
str2 infects by appending. [ruby-core:71811] [Bug #11767]
78+
79+
Wed Dec 2 03:17:01 2015 NARUSE, Yui <[email protected]>
80+
81+
* ext/readline/extconf.rb: call dir_config("libedit")
82+
if --enable-libedit is spcified. [Bug #11751]
83+
patched by John Hein
84+
85+
Wed Dec 2 02:59:42 2015 Nobuyoshi Nakada <[email protected]>
86+
87+
* parse.y (parser_here_document): store dispatched result of
88+
on_tstring_content at the last fragment of a here document.
89+
90+
Tue Dec 1 02:52:17 2015 CHIKANAGA Tomoyuki <[email protected]>
91+
92+
* test/ruby/test_gc.rb: merge partially r52391 to get rid of CI error.
93+
94+
Tue Dec 1 02:27:41 2015 Nobuyoshi Nakada <[email protected]>
95+
96+
* io.c (rb_io_each_codepoint): raise an exception at incomplete
97+
character before EOF when conversion takes place. [Bug #11444]
98+
99+
Sun Nov 29 18:02:44 2015 Shugo Maeda <[email protected]>
100+
101+
* io.c (argf_getpartial): should not resize str if the second
102+
argument is not given.
103+
[ruby-core:71668] [Bug #11738]
104+
105+
Sun Nov 29 17:48:39 2015 Nobuyoshi Nakada <[email protected]>
106+
107+
* vm_eval.c (local_var_list_add): skip internal local variable
108+
name by its type but not if it has a name. internal local
109+
variable names are just unique per frame, not globally.
110+
[ruby-core:71437] [Bug #11674]
111+
112+
Sun Nov 29 17:13:16 2015 Nobuyoshi Nakada <[email protected]>
113+
114+
* io.c (rb_io_each_codepoint): read more data when read partially.
115+
[ruby-core:70379] [Bug #11444]
116+
117+
Sun Nov 29 16:46:25 2015 SHIBATA Hiroshi <[email protected]>
118+
119+
* lib/net/http.rb: set hostname before call ossl_ssl_set_session.
120+
[Bug #11401][ruby-core:70152][fix GH-964] Patch by @mkarnebeek
121+
122+
Sun Nov 29 16:33:30 2015 Nobuyoshi Nakada <[email protected]>
123+
124+
* transcode.c (rb_econv_open0): rb_econv_t::source_encoding_name
125+
and rb_econv_t::destination_encoding_name should refer static
126+
strings always or NULL. [ruby-core:70247] [Bug #11416]
127+
128+
Sun Nov 29 16:11:32 2015 Eric Wong <[email protected]>
129+
130+
* iseq.c (iseq_data_to_ary): dump kw_arg as symbol
131+
* test/-ext-/iseq_load/test_iseq_load.rb: test kw_arg roundtrip
132+
[ruby-core:69891] [Bug #11338]
133+
134+
Sun Nov 29 02:55:56 2015 Kazuhiro NISHIYAMA <[email protected]>
135+
136+
* gc.c (__has_feature): move into internal.h.
137+
138+
* internal.h (__has_feature): ditto.
139+
140+
* internal.h (__has_extension): new macro.
141+
142+
* internal.h (STATIC_ASSERT): use _Static_assert with
143+
clang. [ruby-core:69931] [Bug #11343]
144+
145+
Sat Nov 28 06:28:55 2015 Nobuyoshi Nakada <[email protected]>
146+
147+
* parse.y (literal_concat_gen, evstr2dstr_gen): keep literal
148+
encoding beginning with an interpolation same as the source file
149+
encoding. [ruby-core:70703] [Bug #11519]
150+
151+
Sat Nov 28 06:12:32 2015 NARUSE, Yui <[email protected]>
152+
153+
* ext/openssl/ossl_ssl.c (ssl_npn_select_cb): explicitly raise error
154+
in ext/openssl instead of OpenSSL itself because LibreSSL
155+
silently truncate the selected protocol name by casting the length
156+
from int to unsigned char. [Bug #11369]
157+
Patch by Jeremy Evans <[email protected]>
158+
159+
Sat Nov 28 05:50:58 2015 Nobuyoshi Nakada <[email protected]>
160+
161+
* vm_eval.c (send_internal): set method_missing_reason before
162+
invoking overriding method_missing method so that the default
163+
method_missing can achieve it properly.
164+
[ruby-core:68515] [Bug #10969]
165+
166+
Sat Nov 28 05:47:27 2015 Rei Odaira <[email protected]>
167+
168+
* test/ruby/test_symbol.rb (test_symbol_fstr_leak): add a warm-up
169+
code and check RSS to avoid false positive on AIX and false
170+
negative on Mac OS X. [Bug #10686]
171+
172+
Sat Nov 28 05:47:27 2015 Rei Odaira <[email protected]>
173+
174+
* test/ruby/test_symbol.rb: avoid a false positive in AIX.
175+
176+
Sat Nov 28 05:35:28 2015 CHIKANAGA Tomoyuki <[email protected]>
177+
178+
* test/objspace/test_objspace.rb
179+
(test_trace_object_allocations_start_stop_clear): clear object
180+
allocation table first to get rid of erroneous detection for obj3.
181+
[ruby-dev:49095] [Bug #11271]
182+
183+
Sat Nov 28 05:21:06 2015 Koichi Sasada <[email protected]>
184+
185+
* insns.def (defined): skip respond_to_missing? when
186+
a method is available.
187+
[Bug #11211]
188+
189+
* test/ruby/test_defined.rb: add a test for this fix.
190+
191+
Wed Nov 25 01:05:29 2015 CHIKANAGA Tomoyuki <[email protected]>
192+
193+
* ext/digest/sha1/sha1ossl.c: fix defs.h path to catch up changes in
194+
r52739.[Bug #3231]
195+
196+
* ext/digest/rmd160/rmd160ossl.c: ditto.
197+
198+
Wed Nov 25 00:54:15 2015 Nobuyoshi Nakada <[email protected]>
199+
200+
* parse.y (kwd_append): fix segv after invalid keyword argument,
201+
preceding keyword list is NULL when syntax error is there.
202+
[ruby-core:71356] [Bug #11663]
203+
204+
Wed Nov 25 00:47:07 2015 SHIBATA Hiroshi <[email protected]>
205+
206+
* lib/ipaddr.rb, test/test_ipaddr.rb: Reject invalid address contained
207+
EOL string. Patch by @kachick [fix GH-942][Bug #11513]
208+
209+
Wed Nov 25 00:32:44 2015 Nobuyoshi Nakada <[email protected]>
210+
211+
* compile.c (iseq_build_from_ary_body): register cdhash to the
212+
iseq constant body instead of compile time mark array, not to
213+
get GCed. [ruby-core:70708] [Feature #8543]
214+
215+
Wed Nov 25 00:14:28 2015 NARUSE, Yui <[email protected]>
216+
217+
* ext/digest/*/*.[ch]: include ruby.h before digest.h to avoid
218+
includeing ext/digest/extconf.h. [Bug #3231]
219+
https://msdn.microsoft.com/library/36k2cdd4.aspx
220+
221+
* ext/digest/*/extconf.rb: remove ext/digest from include search path
222+
to avoid confusion of cl.exe.
223+
224+
* ext/digest/*/*.[ch]: explicitly specify def.h's path.
225+
226+
Wed Nov 25 00:03:42 2015 SHIBATA Hiroshi <[email protected]>
227+
228+
* Added missing reference of GitHub
229+
230+
Wed Nov 25 00:03:42 2015 Trevor Rowe <[email protected]>
231+
232+
* lib/net/http.rb: Fixed regression for Net::HTTP::PUT with "Expect-100"
233+
header. [fix GH-949]
234+
* test/net/http/test_http.rb: added test.
235+
236+
Mon Nov 23 00:19:51 2015 Koichi Sasada <[email protected]>
237+
238+
* vm_insnhelper.c (vm_invoke_block): we should not expect ci->argc is
239+
stable after invoking a block. [Bug #11451]
240+
241+
* test/ruby/test_yield.rb: add a test. This test script is given by
242+
Alex Dowad.
243+
244+
Thu Nov 19 01:06:07 2015 Nobuyoshi Nakada <[email protected]>
245+
246+
* load.c (rb_load_internal0): stop separating exits at loading
247+
from exits from execution. TAG_FATAL is the only case that
248+
`errinfo` is a Fixnum, and should continue to exit by JUMP_TAG
249+
but not raising as an ordinary exception.
250+
[ruby-core:70169] [Bug #11404]
251+
252+
Thu Nov 19 01:06:07 2015 Alex Dowad <[email protected]>
253+
254+
* load.c (rb_load_internal0): extra check before returning
255+
TAG_RAISE when a non-local transfer of control happens while
256+
loading and parsing a Ruby source file.
257+
[ruby-core:70169] [Bug #11404]
258+
259+
Thu Nov 19 01:06:07 2015 Nobuyoshi Nakada <[email protected]>
260+
261+
* load.c (rb_load_internal0): do not raise any exceptions but
262+
return the result tag state.
263+
264+
* load.c (rb_load_protect): reduce nested EXEC_TAGs.
265+
266+
Thu Nov 19 00:41:09 2015 NARUSE, Yui <[email protected]>
267+
268+
* enc/euc_jp.c (mbc_case_fold): check given string is valid or not,
269+
and if invalid, return 1. [Bug #11486]
270+
271+
Thu Nov 19 00:15:23 2015 Zachary Scott <[email protected]>
272+
273+
* ext/openssl/ossl_pkey.c: Merge ruby/openssl@b9ea8ef [Bug #10735]
274+
275+
Thu Nov 19 00:01:14 2015 Nobuyoshi Nakada <[email protected]>
276+
277+
* io.c (argf_next_argv): check ARGV element type, and try
278+
conversion if necessary. [ruby-core:71140] [Bug #11610]
279+
280+
Wed Nov 18 23:29:32 2015 Aaron Patterson <[email protected]>
281+
282+
* ext/openssl/ossl_ssl.c (ossl_ssl_method_tab): Only add SSLv3 support
283+
if the SSL library supports it. Thanks Kurt Roeckx <[email protected]>
284+
[Bug #11376]
285+
286+
* ext/openssl/extconf.rb: check for SSLv3 support in the SSL
287+
implementation.
288+
289+
* test/openssl/test_ssl.rb (class OpenSSL): Skip tests that need SSLv3
290+
if there is no support.
291+
292+
Mon Nov 16 03:39:59 2015 CHIKANAGA Tomoyuki <[email protected]>
293+
294+
* tool/runruby.rb: rubyspec now requires other FDs not to be closed
295+
since 7b6ce1fee.
296+
297+
Sun Nov 8 23:30:56 2015 Koichi Sasada <[email protected]>
298+
299+
* vm_trace.c (rb_threadptr_exec_event_hooks_orig):
300+
maintain trace_running counter on internal events.
301+
302+
This patch is made by Takashi Kokubun <[email protected]>.
303+
[Bug #11603] https://github.com/ruby/ruby/pull/1059
304+
305+
Sun Nov 1 03:52:41 2015 Aaron Patterson <[email protected]>
306+
307+
* test/openssl/test_ssl_session.rb: Fix tests so that they take in to
308+
account OpenSSL installations that have SSLv3 disabled by default.
309+
Thanks Jeremy Evans <[email protected]> for the patches.
310+
[Bug #11366] [Bug #11367]
311+
312+
Sun Nov 1 03:40:43 2015 SHIBATA Hiroshi <[email protected]>
313+
314+
* test/openssl/test_ssl_session.rb (OpenSSL#test_ctx_client_session_cb):
315+
fix test failure with OpenSSL disabled SSLv3 protocol.
316+
[ruby-core:63772] [Bug #10046]
317+
318+
Tue Oct 27 23:58:32 2015 Koichi Sasada <[email protected]>
319+
320+
* vm.c (hook_before_rewind): prevent kicking :return event while
321+
finishing vm_exec func because invoke_block_from_c() kick a :return
322+
event for bmethods.
323+
[Bug #11492]
324+
325+
* test/ruby/test_settracefunc.rb: add a test.
326+
327+
Tue Oct 27 23:38:26 2015 Nobuyoshi Nakada <[email protected]>
328+
329+
* configure.in: check for libunwind.h, which is not available in
330+
very old OS X SDK. [ruby-core:71080] [Bug #11591]
331+
332+
Tue Oct 27 23:32:51 2015 Masatoshi SEKI <[email protected]>
333+
334+
* test/drb/test_drb.rb: Run Rinda/DRb tests on localhost. [Fix GH-1027]
335+
patch by voxik.
336+
337+
* test/rinda/test_rinda.rb: ditto
338+
339+
Tue Oct 6 01:29:02 2015 Nobuyoshi Nakada <[email protected]>
340+
341+
* parse.y (IS_BEG): include labeled argument state, which was
342+
EXPR_LABELARG. [ruby-dev:49221] [Bug #11456]
343+
344+
Tue Oct 6 01:29:02 2015 Nobuyoshi Nakada <[email protected]>
345+
346+
* parse.y: fix syntax error at do-block after a conditional
347+
operator. separate label-allowed and after-a-label states from
348+
others as bit flags. [ruby-dev:48790] [Bug #10653]
349+
350+
Mon Oct 5 03:29:23 2015 Tanaka Akira <[email protected]>
351+
352+
* enum.c (nmin_filter): Fix limit value.
353+
patch by Helder Pereira.
354+
[Bug #11471] [ruby-core:70477]
355+
356+
Wed Sep 30 03:44:36 2015 Nobuyoshi Nakada <[email protected]>
357+
358+
* lib/rss/rss.rb (Time#w3cdtf): fix zero-trimmed width of fraction
359+
digits. [ruby-core:70667] [Bug #11509]
360+
361+
Wed Sep 30 03:34:25 2015 Nobuyoshi Nakada <[email protected]>
362+
363+
* re.c (rb_memsearch_wchar, rb_memsearch_qchar): test matching
364+
till the end of string. [ruby-core:70592] [Bug #11488]
365+
366+
* test/ruby/test_m17n.rb (test_include?, test_index): add tests by
367+
Tom Stuart.
368+
369+
Wed Sep 30 03:24:29 2015 NARUSE, Yui <[email protected]>
370+
371+
* thread_pthread.c (reserve_stack): ensure the memory is really
372+
allocated. [Bug #11457]
373+
374+
Tue Aug 25 01:01:01 2015 Koichi Sasada <[email protected]>
375+
376+
* insns.def (defineclass): introduce an ad-hoc patch to avoid
377+
an issue reported on [Bug #10871].
378+
379+
This patch does not fix completely. For example, method definition
380+
in a block (like 1.times{def ...; end}) still causes same issue.
381+
To solve all, we need a huge patch and it seems difficult for
382+
stable branch.
383+
384+
Use Ruby 2.3 and later to solve this issue completely.
385+
(See [Bug #10943])
386+
1387
Tue Aug 18 22:52:50 2015 NAKAMURA Usaku <[email protected]>
2388

3389
* tool/downloader.rb: support old versions of ruby.

0 commit comments

Comments
 (0)