summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-05-29merge revision(s) 49618,49640: [Backport #10858]usa
* win32/file.c (rb_file_expand_path_internal): do not make invalid (or ADS) path if the path has a drive letter, the result also should have be under it. [ruby-core:68130] [Bug #10858] * win32/file.c (rb_file_expand_path_internal): neither the drive of base directory nor the current drive are involved in the result if different than the drive of path. [ruby-core:68130] [Bug #10858] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50669 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-29Partially merge revision 49195: [Bug #10717]usa
Support cmake 2.6 which is used by RHEL6/ CentOS 6 https://github.com/rubygems/rubygems/pull/1124 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50668 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-29* marshal.c (r_symreal): register the symbol name first so thatusa
r_symlink always returns valid names. [Bug #10991] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50667 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-28merge revision(s) 49999,50000: [Backport #10979]usa
* hash.c (rb_any_hash): use same hash values with Float#hash so that -0.0 and +0.0 will be identical. [ruby-core:68541] [Bug #10979] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50655 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-21merge revision(s) 50449: [Backport #11123]usa
* ext/socket/ancdata.c (bsock_recvmsg_internal): GC guard [Bug #11123] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50584 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-21merge revision(s) 50444: [Backport #11128]usa
* lib/net/imap.rb (body_ext_mpart): should work even if body-fld-dsp is omitted. [ruby-core:69093] [Bug #11128] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-21merge revision(s) 50509: [Backport #11132]usa
* string.c: added documentation for character sequence \' with String#sub [Bug #11132][ruby-core:69121][fix GH-900][ci skip] Patch by @shishir127 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50582 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-21merge revision(s) 50421: [Backport #11113]usa
* range.c (linear_object_p, range_include): test if covered for linear objects. [ruby-core:69052] [Bug #11113] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50581 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-21merge revision(s) 50406,50407: [Backport #11075]usa
* rational.c: Added documentation for rational literal. [Bug #11075][fix GH-885][ci skip] Patch by @shishir127 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50579 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-21merge revision(s) 50404,50405: [Backport #10975]usa
* ext/socket/ipsocket.c (init_inetsock_internal): preserve errno before other library calls and use rb_syserr_fail. [ruby-core:68531] [Bug #10975] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50578 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-21merge revision(s) 50305: [Backport #11065]usa
* ext/-test-/printf/printf.c (uint_to_str): renamed to get rid of conflict on cygwin. [ruby-core:68877] [Bug #11065] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50577 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-21merge revision(s) 50206: [Backport #10724]usa
* vm.c (vm_exec): check other events when RETURN is thrown. [Bug #10724] * test/ruby/test_settracefunc.rb: add a test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50576 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-21merge revision(s) 50187,50202: [Backport #11051]usa
* ext/socket/raddrinfo.c (addrinfo_mload): fix memory leak of addrinfo. [ruby-dev:48923] [Bug #11051] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50575 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-21merge revision(s) 50185: [Backport #10952]usa
* bigdecimal: conform to ruby's license. [ruby-core:68466] [Bug #10952] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50574 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-21merge revision(s) 49792: [Backport #10918]usa
* gc.c (id2ref): prohibit from accessing internal objects. [ruby-core:68348] [Bug #10918] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50571 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-21merge revision(s) 49776: [Backport #9144]usa
* ext/pty/pty.c: AIX supports autopush. Patch by Perry Smith [ruby-core:58539] [Bug #9144] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50570 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-20merge revision(s) 50541,50542: [Backport #11159]usa
* iseq.c (rb_iseq_compile_with_option): check srouce type, must be an IO or a String. [ruby-core:69219] [Bug #11159] * iseq.c (rb_iseq_compile_with_option): check source type, must be git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50559 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-13merge revision(s) 49095: [Backport #11144]usa
* lib/resolv.rb (Resolv::DNS::Label::Str#==): Check class equality. (Resolv::DNS::Name#initialize): Normalize labels as Resolv::DNS::Label::Str objects. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50482 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-12* ext/tk/extconf.rb: support Tcl/Tk8.6.usa
* ext/tk/tcltklib.c, ext/tk/lib/tk.rb: get rid of SEGV with Tcl/Tk8.6. [Backport #10401] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50474 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-11merge revision(s) 50416: [Backport #11111]usa
dln.c: fix EXTERNAL_PREFIX * configure.in (EXPORT_PREFIX): revert r50410. * dln.c (EXTERNAL_PREFIX): define by predefined macros. configured EXPORT_PREFIX is different thing. * win32/Makefile.sub: r50414-50415. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50469 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-05-11merge revision(s) 50402: [Backport #11107]usa
* parse.y (lambda): push and reset cmdarg_stack in lambda body. [ruby-core:69017] [Bug #11107] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50468 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-04-28merge revision(s) 50141: [Backport #11021]usa
* lib/fileutils.rb (FileUtils#mv): show the exact target path in the error message instead of the destination parent directory name. patched by Joao Britto <jabcalves AT gmail.com> at [ruby-core:68706]. [Bug #11021] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50397 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-04-28merge revision(s) 50316: [Backport #11030]usa
* thread_pthread.c (reserve_stack): keep sp safe zone to get rid of crash by -fstack-check. [ruby-core:68740] [Bug #11030] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50396 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-04-24merge revision(s) 49154,49155,49156,49159: [Backport #10384] [Backport #11085]usa
ext/-test-/dln/empty: move from ext/-test-/win32/dln * test/fiddle/test_handle.rb: fix syntax. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50383 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-04-14* version.h (RUBY_VERSION): bump RUBY_VERSION to 2.1.7.usa
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50312 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-04-13* version.h: bump to 2.1.6.usa
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50297 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-04-13merge revision(s) 50292: [Backport #9644]usa
* ext/openssl/lib/openssl/ssl.rb: stricter hostname verification following RFC 6125. with the patch provided by Tony Arcieri and Hiroshi Nakamura [ruby-core:61545] [Bug #9644] * test/openssl/test_ssl.rb: add tests for above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50296 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-04-13merge revision(s) 49634,49658,49663: [Backport #10865]usa
* win32/win32.c (wrename): return EXDEV if moving a directory to another drive, since MoveFileExW does not set proper error code. [ruby-core:68162] [Bug #10865] * win32/win32.c (different_device_p): compare by volume serial numbers, not by path names. numbers, not by path names. [ruby-core:68162] [Bug #10865] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50290 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-04-13merge revision(s) 49452: [Backport #10813]usa
* thread_pthread.c (reserve_stack): fix intermittent SIGBUS on Linux, by reserving the stack virtual address space at process start up so that it will not clash with the heap space. [Fix GH-822] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50289 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-04-13merge revision(s) 49875: [Backport #10946]usa
* class.c (rb_prepend_module): need a WB for klass -> origin. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-04-13merge revision(s) 49867: [Backport #10847] [Backport #10970]usa
* vm_eval.c (vm_call_super): search next super class from the original class, to get rid of infinite recursion with prepending. a patch by Seiei Higa <hanachin AT gmail.com> at [ruby-core:68434]. [ruby-core:68093] [Bug #10847] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50284 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-04-13merge revision(s) 50265: [Backport #10957]usa
* parse.y (arg): fix segfault by null caused by syntax error. [ruby-core:68851] [Bug #10957] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50283 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-31merge revision(s) r48987,r48989: [Backport #10646]nagachika
test_io_console.rb: chomp results * test/io/console/test_io_console.rb (run_pty): IO#readlines ignores the given block. need map to chomp the results. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50140 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-30merge revision(s) r48999,r49484: [Backport #10646]nagachika
* gc.c (wmap_final_func): fix memory size shortage when realloc wmap. Fix SEGV during finilize of WeakRef on Solaris (though the SEGV could occur on all OS/platforms). [ruby-dev:48779] [Bug #10646] Fix SEGV during finalize of WeakRef on Solaris (though the SEGV git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50132 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-30merge revision(s) r49184: [Backport #10707]nagachika
* vm_method.c (rb_method_entry): if no super class, no original method entry. [ruby-core:67389] [Bug #10707] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50131 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-30merge revision(s) r49192: [Backport #10716]nagachika
* configure.in (RUBY_SETJMP_TYPE): Remove superfluous semicolon which causes a syntax error with autoconf 2.63. [ruby-core:67429] [Bug #10716] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50130 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-30merge revision(s) r49157: [Backport #10384]nagachika
* test/fiddle/test_handle.rb (test_NEXT): use -test-/dln/empty which is always a shared object and is not used by others. [ruby-dev:48629] [Bug #10384] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50129 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-30merge revision(s) r49964: [Backport #10957]nagachika
* parse.y (primary): empty parentheses at cmdarg can be null. [ruby-core:68477] [Bug #10957] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50128 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-30merge revision(s) r48878: [Backport #9591]nagachika
io-console.gemspec: bump up * ext/io/console/io-console.gemspec: bump up to 0.4.3. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50127 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-30merge revision(s) r46254,r48982,r48984: [Backport #10649]nagachika
test/io/console/test_io_console.rb: Close FDs. * ext/io/console/console.c (console_dev): id_console is not a constant name, use rb_const_remove() to get rid of NameError. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-23merge revision(s) r47129,r48844: [Backport #10120]nagachika
configure.in: remove SSE options git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50067 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-21merge revision(s) r44681: [Backport #9440]nagachika
* ext/thread/thread.c (Init_thread): ConditionVariable and Queue are not able to copy. [ruby-core:59961] [Bug #9440] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50044 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-17merge revision(s) r48690: [Backport #10563]nagachika
* win32/win32.c (w32_spawn): `v2` is used not only for `shell` but also `cmd`, so must not free before using `cmd`. [ruby-core:66648] [Bug #10563] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49997 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-17merge revision(s) r48585,r48587: [Backport #10546]nagachika
* win32/win32.c (constat_reset): do nothing on non-standard console emurators. [ruby-core:66471] [Bug #10546] console emulators. [ruby-core:66471] [Bug #10546] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49996 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-17merge revision(s) r49685,r49687: [Backport #10885]nagachika
* vm_insnhelper.c (rb_vm_rewrite_cref_stack): copy nd_refinements of orignal crefs. It fixes segmentation fault when calling refined method in duplicate module. [ruby-dev:48878] [Bug #10885] * vm_core.h, class.c: change accordingly. * test/ruby/test_refinement.rb: add a test for above. of original crefs. It fixes segmentation fault when calling git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49995 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-17merge revision(s) r49490,r49494: [Backport #10825]nagachika
* ext/sdbm/_sdbm.c: include ruby/ruby.h for PRIdPTRDIFF when a macro `DEBUG` is defined. based on the patch by Owen Rodley in [ruby-core:67987]. [Bug #10825] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49994 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-17merge revision(s) r49482,r49487: [Backport #10821]nagachika
* lib/mkmf.rb (try_cppflags, try_cflags, try_ldflags): get rid of interference by modifying global variables in have_devel? method. [ruby-core:67962] [Bug #10821] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49993 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-17merge revision(s) r49222,r49480,r49493: [Backport #10765]nagachika
method.h: UNDEFINED_REFINED_METHOD_P * method.h (UNDEFINED_REFINED_METHOD_P): macro to tell if refined original method is defined. * vm_method.c (remove_method): When remove refined method, raise a NameError if the method is not defined in refined class. But if the method is defined in refined class, it should keep refined method and remove original method. Patch by Seiei Higa. [ruby-core:67722] [Bug #10765] * class.c (method_entry_i, class_instance_method_list, rb_obj_singleton_methods): should not include methods of superclasses if recur is false. [ruby-dev:48854] [Bug #10826] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49992 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-17merge revision(s) r49322: [Backport #10753]nagachika
* vm_method.c (check_definition): Module#public_method_defined?, Module#private_method_defined?, Module#protected_method_defined? should not use refinements. [ruby-core:67656] [Bug #10753] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49991 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-09merge revision(s) r49428: [Backport #10694]nagachika
* thread.c: Improve documentation for Thread#value [Bug #10694][ruby-core:67324][ci skip] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49912 b2dd03c8-39d4-4d8f-98ff-823fe69b080e