summaryrefslogtreecommitdiff
path: root/version.h
AgeCommit message (Collapse)Author
2015-12-16merge revision(s) 53153:nagachika
* ext/fiddle/handle.c: check tainted string arguments. Patch provided by tenderlove and nobu. * test/fiddle/test_handle.rb (class TestHandle): add test for above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@53154 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-15merge revision(s) 53083:nagachika
* io.c (parse_mode_enc): fix buffer overflow. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@53135 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-12merge revision(s) 53050: [Backport #11501]nagachika
* doc/NEWS-0.2.2: add description about incompatible change in Hash duplicated key overriding policy. [Bug #10315] [Bug #11501] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@53051 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-11merge revision(s) 53039: [Backport #11804]nagachika
* insns.def (opt_case_dispatch): avoid converting Infinity * test/ruby/test_optimization.rb (test_opt_case_dispatch_inf): new [ruby-dev:49423] [Bug #11804]' git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@53040 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-09merge revision(s) 52199: [Backport #11792]nagachika
* configure.in: pthread_getattr_np is broken on AIX. More specifically, the stack address and size returned are not correct. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@53007 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-09merge revision(s) 51808: [Backport #11794]nagachika
* common.mk (update-gems): use BASERUBY instead of RUNRUBY. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@53006 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-08merge revision(s) 52928: [Backport #11784]nagachika
* insns.def (opt_case_dispatch): check Float#=== redefinition * test/ruby/test_optimization.rb (test_opt_case_dispatch): new [ruby-core:71920] [Bug #11784] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52977 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-08merge revision(s) 52892: [Backport #11775]nagachika
* ruby_atomic.h (ATOMIC_SIZE_CAS): fix the argument order of InterlockedCompareExchange64. new value and then old value is the last. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52975 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-08merge revision(s) 52856,52906: [Backport #11760]nagachika
* encoding.c (enc_m_loader): defer finding encoding object not to be infected by marshal source. [ruby-core:71793] [Bug #11760] * marshal.c (r_object0): enable compatible loader on USERDEF class. the loader function is called with the class itself, instead of an allocated object, and the loaded data. * marshal.c (compat_allocator_table): intialize compat_allocator_tbl on demand. * object.c (rb_undefined_alloc): extract from rb_obj_alloc. * marshal.c (compat_allocator_table): initialize git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52974 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-08merge revision(s) 50423: [Backport #11733]nagachika
* ext/-test-/file/fs.c: need to include sys/statvfs.h to use statvfs(). * ext/-test-/file/extconf.rb: check the existence of sys/statvfs.h git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52973 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-03merge revision(s) 52869: [Backport #11766]nagachika
* sprintf.c (rb_str_format): fix wrong shifting position in Rational conversion when not at the beginning of the result. [ruby-core:71806] [Bug #11766] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52874 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-03merge revision(s) 52868: [Backport #11767]nagachika
* range.c (range_to_s): should be infected by the receiver. str2 infects by appending. [ruby-core:71811] [Bug #11767] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52873 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-01merge revision(s) 52795: [Backport #11751]nagachika
* ext/readline/extconf.rb: call dir_config("libedit") if --enable-libedit is spcified. [Bug #11751] patched by John Hein git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-01merge revision(s) 52777: [Backport #11748]nagachika
* parse.y (parser_here_document): store dispatched result of on_tstring_content at the last fragment of a here document. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52837 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-30merge partially revision(s) 52391:nagachika
explicitly overwrite signal handling git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52805 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-30merge revision(s) 51594: [Backport #11444]nagachika
* io.c (rb_io_each_codepoint): raise an exception at incomplete character before EOF when conversion takes place. [Bug #11444] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52804 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-29merge revision(s) 52745: [Backport #11738]nagachika
* io.c (argf_getpartial): should not resize str if the second argument is not given. [ruby-core:71668] [Bug #11738] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52788 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-29merge revision(s) 52536: [Backport #11674]nagachika
* vm_eval.c (local_var_list_add): skip internal local variable name by its type but not if it has a name. internal local variable names are just unique per frame, not globally. [ruby-core:71437] [Bug #11674] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52787 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-29merge revision(s) 51583,51638: [Backport #11444]nagachika
* io.c (rb_io_each_codepoint): read more data when read partially. [ruby-core:70379] [Bug #11444] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52786 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-29merge revision(s) 52682: [Backport #11401] [Backport #11724]nagachika
* lib/net/http.rb: set hostname before call ossl_ssl_set_session. [Bug #11401][ruby-core:70152][fix GH-964] Patch by @mkarnebeek git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52785 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-29merge revision(s) 51488,51489: [Backport #11416]nagachika
* transcode.c (rb_econv_open0): rb_econv_t::source_encoding_name and rb_econv_t::destination_encoding_name should refer static strings always or NULL. [ruby-core:70247] [Bug #11416] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52784 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-29merge revision(s) 51190: [Backport #11338]nagachika
* iseq.c (iseq_data_to_ary): dump kw_arg as symbol * test/-ext-/iseq_load/test_iseq_load.rb: test kw_arg roundtrip [ruby-core:69891] [Bug #11338] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52783 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-28merge revision(s) 52222,52229,52273,52277,52357: [Backport #11613]nagachika
limit the number of FDs in a process for stress test git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52779 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-28merge revision(s) 51242: [Backport #11343]nagachika
* gc.c (__has_feature): move into internal.h. * internal.h (__has_feature): ditto. * internal.h (__has_extension): new macro. * internal.h (STATIC_ASSERT): use _Static_assert with clang. [ruby-core:69931] [Bug #11343] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52778 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-27merge revision(s) 51820: [Backport #11519]nagachika
* parse.y (literal_concat_gen, evstr2dstr_gen): keep literal encoding beginning with an interpolation same as the source file encoding. [ruby-core:70703] [Bug #11519] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52773 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-27merge revision(s) 52227,52228: [Backport #11369]nagachika
* ext/openssl/ossl_ssl.c (ssl_npn_select_cb): explicitly raise error in ext/openssl instead of OpenSSL itself because LibreSSL silently truncate the selected protocol name by casting the length from int to unsigned char. [Bug #11369] Patch by Jeremy Evans <merch-redmine@jeremyevans.net> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52772 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-27merge revision(s) 51427: [Backport #10969]nagachika
* vm_eval.c (send_internal): set method_missing_reason before invoking overriding method_missing method so that the default method_missing can achieve it properly. [ruby-core:68515] [Bug #10969] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52771 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-27merge revision(s) 49813,52140: [Backport #10686]nagachika
* test/ruby/test_symbol.rb: avoid a false positive in AIX. * test/ruby/test_symbol.rb (test_symbol_fstr_leak): add a warm-up code and check RSS to avoid false positive on AIX and false negative on Mac OS X. [Bug #10686] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52770 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-27merge revision(s) 52128,52133: [Backport #11271]nagachika
* test/objspace/test_objspace.rb (test_trace_object_allocations_start_stop_clear): clear object allocation table first to get rid of erronous detection for obj3. [ruby-dev:49095] [Bug #11271] allocation table first to get rid of erroneous detection for obj3. because it is only delegation function. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52769 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-27merge revision(s) 50737: [Backport #11211]nagachika
* insns.def (defined): skip respond_to_missing? when a method is available. [Bug #11211] * test/ruby/test_defined.rb: add a test for this fix. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52768 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-24bump patchlevel for previous commit.nagachika
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52744 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-24merge revision(s) 52461: [Backport #11663]nagachika
* parse.y (kwd_append): fix segv after invalid keyword argument, preceding keyword list is NULL when syntax error is there. [ruby-core:71356] [Bug #11663] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52742 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-24merge revision(s) 52244: [Backport #11513]nagachika
* lib/ipaddr.rb, test/test_ipaddr.rb: Reject invalid address contained EOL string. Patch by @kachick [fix GH-942][Bug #11513] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52741 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-24merge revision(s) 51816: [Backport #8543]nagachika
* compile.c (iseq_build_from_ary_body): register cdhash to the iseq constant body instead of compile time mark array, not to get GCed. [ruby-core:70708] [Feature #8543] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52740 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-24merge revision(s) 52694: [Backport #3231]nagachika
* ext/digest/*/*.[ch]: include ruby.h before digest.h to avoid includeing ext/digest/extconf.h. [Bug #3231] https://msdn.microsoft.com/library/36k2cdd4.aspx * ext/digest/*/extconf.rb: remove ext/digest from include search path to avoid confusion of cl.exe. * ext/digest/*/*.[ch]: explicitly specify def.h's path. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52739 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-24merge revision(s) 52683,52684: [Backport #11719] [Backport #11722]nagachika
* lib/net/http.rb: Fixed regression for Net::HTTP::PUT with "Expect-100" header. * test/net/http/test_http.rb: added test. * Added missing reference of GitHub header. [fix GH-949] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52738 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-22merge revision(s) 51651,51655: [Backport #11451]nagachika
* vm_insnhelper.c (vm_invoke_block): we should not expect ci->argc is stable after invoking a block. [Bug #11451] * test/ruby/test_yield.rb: add a test. This test script is given by Alex Dowad. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52717 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-19merge revision(s) 51445: [Backport #11404] [Backport #11481]nagachika
envutil.rb: -w for assert_separately * test/lib/envutil.rb (assert_separately): always add -w option for warnings. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52661 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-18merge revision(s) 51292,51439,51440: [Backport #11404] [Backport #11481]nagachika
* load.c (rb_load_internal0): do not raise any exceptions but return the result tag state. * load.c (rb_load_protect): reduce nested EXEC_TAGs. * load.c (rb_load_internal0): extra check before returning TAG_RAISE when a non-local transfer of control happens while loading and parsing a Ruby source file. [ruby-core:70169] [Bug #11404] * load.c (rb_load_internal0): stop separating exits at loading from exits from execution. TAG_FATAL is the only case that `errinfo` is a Fixnum, and should continue to exit by JUMP_TAG but not raising as an ordinary exception. [ruby-core:70169] [Bug #11404] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52655 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-18merge revision(s) 52016,52017,52019,52020,52021: [Backport #10735]nagachika
* enc/euc_jp.c (mbc_case_fold): check given string is valid or not, and if invalid, return 1. [Bug #11486] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52652 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-18merge revision(s) 52556,52557: [Backport #10735]nagachika
* ext/openssl/ossl_pkey.c: Merge ruby/openssl@b9ea8ef [Bug #10735] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-18merge revision(s) 52211: [Backport #11610] [Backport #11637]nagachika
* io.c (argf_next_argv): check ARGV element type, and try conversion if necessary. [ruby-core:71140] [Bug #11610] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52650 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-18merge revision(s) 51722,51724: [Backport #11376]nagachika
* ext/openssl/ossl_ssl.c (static const struct): Only add SSLv3 support if the SSL library supports it. Thanks Kurt Roeckx <kurt@roeckx.be> [Bug #11376] * ext/openssl/extconf.rb: check for SSLv3 support in the SSL implementation. * test/openssl/test_ssl.rb (class OpenSSL): Skip tests that need SSLv3 if there is no support. * ext/openssl/ossl_ssl.c (ossl_ssl_method_tab): Only add SSLv3 support git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52649 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-15merge revision(s) 50985: [Backport #11693]nagachika
runruby.rb: don't close other fds * tool/runruby.rb: rubyspec now requires other FDs not to be closed since 7b6ce1fee. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52580 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-08merge revision(s) 52476,52477: [Backport #11603]nagachika
* vm_trace.c (rb_threadptr_exec_event_hooks_orig): maintain trace_running counter on internal events. This patch is made by Takashi Kokubun <takashikkbn@gmail.com>. [Bug #11603] https://github.com/ruby/ruby/pull/1059 * vm_trace.c (rb_threadptr_exec_event_hooks_orig): git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52497 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-10-31merge revision(s) 51569,51649: [Backport #11366] [Backport #11367]nagachika
test_ssl_session.rb: check SSL method * test/openssl/test_ssl_session.rb (test_ctx_server_session_cb): ensure the method to be tested is supported. * test/openssl/test_ssl_session.rb: Fix tests so that they take in to account OpenSSL installations that have SSLv3 disabled by default. Thanks Jeremy Evans <code@jeremyevans.net> for the patches. [Bug #11366] [Bug #11367] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52414 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-10-31merge revision(s) 49099: [Backport #10046]nagachika
* test/openssl/test_ssl_session.rb (OpenSSL#test_ctx_client_session_cb): fix test failure with OpenSSL disabled SSLv3 protocol. [ruby-core:63772] [Bug #10046] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52413 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-10-27merge revision(s) 51713: [Backport #11492]nagachika
* vm.c (hook_before_rewind): prevent kicking :return event while finishing vm_exec func because invoke_block_from_c() kick a :return event for bmethods. [Bug #11492] * test/ruby/test_settracefunc.rb: add a test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52308 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-10-27merge revision(s) 52124: [Backport #11591]nagachika
* configure.in: check for libunwind.h, which is not available in very old OS X SDK. [ruby-core:71080] [Bug #11591] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52307 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-10-27merge revision(s) 51916: [Backport #11543]nagachika
* test/drb/test_drb.rb: Run Rinda/DRb tests on localhost. [Fix GH-1027] patch by voxik. * test/rinda/test_rinda.rb: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52305 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 01:08:43 +0000