summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-12-16add tag v2_1_8v2_1_8usa
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/tags/v2_1_8@53160 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-16fix mistake of previous commit.usa
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53158 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-16merge revision(s): 53153 and 23405@ruby_1_9_1usa
* 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. * ext/dl/handle.c (rb_dlhandle_initialize): prohibits DL::dlopen with a tainted name of library. Patch by sheepman <sheepman AT sheepman.sakura.ne.jp>. * ext/dl/handle.c (rb_dlhandle_sym): ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53156 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-16merge revision(s) 53083: [Backport #11823]usa
* io.c (parse_mode_enc): fix buffer overflow. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-16merge revision(s) 53039: [Backport #11804]usa
* 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_1@53147 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-16merge revision(s) 52199: [Backport #11792]usa
* 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_1@53146 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-16merge revision(s) 52928: [Backport #11784]usa
* 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_1@53145 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-08merge revision(s) 52892: [Backport #11775]usa
* 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_1@52934 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-08merge revision(s) 52856,52906: [Backport #11760]usa
* 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_1@52933 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-04merge revision(s) 52868: [Backport #11767]usa
* 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_1@52875 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-02merge revision(s) 52795: [Backport #11751]usa
* 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_1@52853 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-01merge revision(s) 51583,51594,51638: [Backport #11444]usa
* io.c (rb_io_each_codepoint): read more data when read partially. [ruby-core:70379] [Bug #11444] * 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_1@52831 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-01* ext/digest/sha1/sha1ossl.c: fixed build error introduced at r52797.usa
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52828 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-30merge revision(s) 50737: [Backport #11211]usa
* 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_1@52802 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-30* ext/digest/rmd160/rmd160.c: fixed commit mistake at r52797.usa
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52801 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-30merge revision(s) 52745: [Backport #11738]usa
* 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_1@52800 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-30merge revision(s) 52682: [Backport #11401]usa
* 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_1@52799 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-30merge revision(s) 51488,51489: [Backport #11416]usa
* 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_1@52798 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-30merge revision(s) 52694: [Backport #3231]usa
* 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_1@52797 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-30merge revision(s) 52683,52684: [Backport #11719] [Backport #11722]usa
* 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_1@52796 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-18merge revision(s) 50104,50105: [Backport #10906]usa
* ext/date/extconf.rb: try_cflags("-std=iso9899:1999") [Bug #10906] ruby itself (including numeric.c) is built with strict compile options including -std=iso9899:1999, but ext/date is not. By the way -std=iso9899:1999 is not only a warning option but also changes behavior like MACRO definitions for example INFINITY. gcc on Solaris affect this. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52645 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-18merge revision(s) 50985: [Backport #11693]usa
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_1@52644 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-18merge revision(s) 52556,52557: [Backport #10735]usa
* ext/openssl/ossl_pkey.c: Merge ruby/openssl@b9ea8ef [Bug #10735] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52643 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-18merge revision(s) 51722,51724: [Backport #11376]usa
* 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_1@52642 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-18merge revision(s) 52476,52477: [Backport #11603]usa
* 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_1@52641 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-18merge revision(s) 48609: [Backport #10449] [Backport #11651]usa
* compile.c (iseq_compile_each): remove duplicated line event. [Bug #10449] * test/ruby/test_settracefunc.rb: add and fix tests. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52640 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-18merge revision(s) 51713: [Backport #11492] [Backport #11646]usa
* 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_1@52639 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-18merge revision(s) 51569,51649: [Backport #11367]usa
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_1@52638 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-11-18merge revision(s) 49099: [Backport #10046]usa
* 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_1@52637 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-10-29merge revision(s) 45576: [Backport #11572]usa
* string.c (sym_to_proc), proc.c (rb_block_clear_env_self): clear caller's self which is useless, so that it can get collected. [Fixes GH-592] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52362 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-10-29* ChangeLog: fixed wrong version number of rubygems. reported by Rob Braden.usa
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52361 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-10-29merge revision(s) 52244: [Backport #11513]usa
* 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_1@52360 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-10-29merge revision(s) 52229,52273,52277,52357: [Backport #11613]usa
Add rlimit_nproc to avoid to create many process [Bug #11613] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52358 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-10-29merge revision(s) 52227,52228: [Backport #11369]usa
* 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_1@52356 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-10-29merge revision(s) 52124: [Backport #11591]usa
* 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_1@52354 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-10-29merge revision(s) 51916: [Backport #11543]usa
* 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_1@52353 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-09-29merge revision(s) 51820: [Backport #11519]usa
* 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_1@51978 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-09-29merge revision(s) 51766,51767: [Backport #11509]usa
* lib/rss/rss.rb (Time#w3cdtf): fix zero-trimmed width of fraction digits. [ruby-core:70667] [Bug #11509] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51977 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-09-29merge revision(s) 51685: [Backport #11488]usa
* re.c (rb_memsearch_wchar, rb_memsearch_qchar): test matching till the end of string. [ruby-core:70592] [Bug #11488] * test/ruby/test_m17n.rb (test_include?, tet_index): add tests by Tom Stuart. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51976 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-09-29merge revision(s) 51626: [Backport #11457]usa
* thread_pthread.c (reserve_stack): ensure the memory is really allocated. [Bug #11457] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51975 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-09-29* version.h (RUBY_VERSION): bump RUBY_VERSION to 2.1.8.usa
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51974 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-18merge revision(s) 50829: [Backport #11248]usa
* lib/rubygems.rb: bump version to 2.4.5.1. this version fixed CVE-2015-3900. * lib/rubygems/remote_fetcher.rb: ditto. * test/rubygems/test_gem_remote_fetcher.rb: added testcase for CVE-2015-3900 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51627 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-17merge revision(s) 51575,51584: [Backport #11439]usa
* ext/win32/lib/win32/registry.rb (API#SetValue): add terminator size, not 1 byte. [ruby-core:70365] [Bug #11439] * ext/win32/lib/win32/registry.rb (API#SetValue): data size should be in bytes, not in chars. [ruby-core:70365] [Bug #11439] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-17merge revision(s) 51470: [Backport #11413]usa
* re.c (rb_memsearch): should match only char boundaries in wide character encodings. [ruby-core:70220] [Bug #11413] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51615 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-17merge revision(s) 51116: [Backport #11324]usa
* transcode.c (rb_econv_set_replacement): target encoding name can be empty now. [ruby-core:69841] [Bug #11324] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51614 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-17merge revision(s) 51423,51425: [Backport #9381]usa
test_hash.rb: add assertions * test/ruby/test_hash.rb (test_wrapper_of_special_const): test other special obejcts. [Bug #9381] * hash.c (rb_any_hash): fix Float hash. rb_dbl_hash() returns a Fixnum, but not a long. [Bug #9381] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51613 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-17merge revision(s) 44497: [Backport #11441]usa
* ext/socket/socket.c (rsock_syserr_fail_host_port): use format flags, '+' to inspect, ' ' to quote unprintables. * ext/socket/socket.c (rsock_syserr_fail_path): ditto. * ext/socket/socket.c (rsock_syserr_fail_raddrinfo): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51612 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-17merge revision(s) 51066: [Backport #11319]usa
* io.c (rb_io_oflags_modestr): handle O_TRUNC correctly * test/ruby/test_io.rb (test_reopen_stdio): new test Patch-by: cremno phobia <cremno@mail.ru> [ruby-core:69779] [Bug #11319] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51611 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-17merge revision(s) 51046: [Backport #11260]usa
* lib/net/ftp.rb (makeport): close the TCPServer when sending the port fails. * test/net/ftp/test_ftp.rb: test for above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51610 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-08-17merge revision(s) 46681,51464,51465: [Backport #11058]usa
* lib/net/http/response.rb (Net::HTTPResponse.each_response_header): raise first exception even if inflate_body_io.finish raises error. when begin block raises error, finish usually raises error too. * lib/net/http/response.rb (Net::HTTPResponse#inflater): fix TypeError. An exception object might be nil. [ruby-core:68846] [Bug #11058] * lib/net/http/response.rb (Net::HTTPResponse::Inflater#finish): fix a bug that empty gzipped response body causes Zlib::BufError. [ruby-core:68846] [Bug #11058] * test/net/http/test_httpresponse.rb: tests for the above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51609 b2dd03c8-39d4-4d8f-98ff-823fe69b080e