summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Create correct split rule for ruby-docbaserock/liw/sam/chefSam Thursfield2014-07-041-0/+8
| | | | The docs are about 70MB so it's very useful to be able to split them out of systems.
* Add missing unistd.h include for the write() functionbaserock/ruby_2_0_0Richard Dale2014-05-031-0/+1
|
* Fix the test for ELF executables so that it works with busy boxRichard Dale2014-05-031-2/+2
|
* add ruby.morphPaul Sherwood2014-05-031-0/+9
|
* missed at r45748.usa2014-04-302-1/+24
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45762 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* revert r45747 because it introduced severe incompatibility.usa2014-04-305-102/+7
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45755 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) 45518: [Backport #9702]usa2014-04-303-2/+7
| | | | | | | | * ext/readline/extconf.rb (rl_hook_func_t): check pointer type. [ruby-dev:48089] [Bug #9702] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45754 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) 45471: [Backport #9688]usa2014-04-303-1/+13
| | | | | | | | | | | * win32/win32.c (rb_w32_accept, open_ifs_socket, socketpair_internal): reset inherit flag of socket to avoid unintentional inheritance of socket. note that the return value of SetHandleInformation() is not verified intentionally because old Windows may return an error. [Bug #9688] [ruby-core:61754] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45753 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) 45364,45395,45396,45403,45406: [Backport #9652]usa2014-04-304-1/+24
| | | | | | | | | | * time.c (time_mload): freeze and preserve marshal-loaded time zone * test/ruby/test_time.rb: add test for GC on loaded object [Bug #9652] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45752 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) 45365: [Backport #9656]usa2014-04-302-2/+7
| | | | | | | | | dl/extconf.rb: check for -fno-defer-pop option * ext/dl/extconf.rb: check for -fno-defer-pop option, since clang 5.1 no longer support -fno-defer-pop option. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45751 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) 45367,45387,45388,45389: [Backport #9475]usa2014-04-304-3/+85
| | | | | | | | | | | | | | * vm_method.c (rb_method_entry_get_without_cache): me->klass is 0 for a method aliased in a module. [ruby-core:61636] [Bug #9663] * vm_method.c (rb_method_entry_get_without_cache): get rid of infinite recursion at aliases in a subclass and a superclass. return actually defined class for other than singleton class. [ruby-core:60431] [Bug #9475] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45750 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* missed at previous commit.usa2014-04-302-1/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45749 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) 45320,45321: [Backport #9622]usa2014-04-304-14/+44
| | | | | | | | | | | | * vm_insnhelper.c (vm_callee_setup_arg): turn a macro into an inline function. * vm_insnhelper.c (vm_callee_setup_arg): disable fastpath if splat argument, since argc may differ for each calls. [ruby-core:61422] [Bug #9622] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45748 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) 43682,43727,43752,43759: [Backport #9560]usa2014-04-305-7/+102
| | | | | | | | | | | | | | | | | | * lib/delegate.rb (Delegator#send): override to get rid of global function interference. [Fixes GH-449] * lib/delegate.rb (Delegator#send): separate from method_missing so that super calls proper method. * lib/delegate.rb (Delegator#method_missing): try private methods defined in Kernel after the target. [Fixes GH-449] * lib/delegate.rb (SimpleDelegator#__getobj__): target object must be set. * lib/delegate.rb (DelegateClass#__getobj__): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45747 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) 45488: [Backport #9631]usa2014-04-303-5/+10
| | | | | | | | * ext/readline/extconf.rb: fix typo, `$defs` not `$DEFS`. [ruby-core:61756] [Bug #9578] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45746 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r45374: [Backport #8405]nagachika2014-03-304-3/+18
| | | | | | | | | | | * lib/csv.rb: Fixed a broken regular expression that was causing CSV to miss escaping some special meaning characters when used in parsing. Reported by David Unric [ruby-core:54986] [Bug #8405] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45476 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * test/ruby/envutil.rb (assert_no_memory_leak): increase default valuenagachika2014-03-302-1/+7
| | | | | | | | of `limit` keyword argument. assert_no_memory_leak occasionally fails with limit=1.5. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45475 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r45360,r45361: [Backport #9651]nagachika2014-03-304-5/+16
| | | | | | | | | | * vm_eval.c (eval_string_with_cref): Use file path even if scope is given. Related to [ruby-core:56099] [Bug #8662] and r42103. * vm_eval.c (eval_string_with_cref): Unify to use NIL_P. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45474 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r42230,r42231: [Backport #9651]nagachika2014-03-307-66/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | parse.y, vm_eval.c: file encoding in eval * parse.y (yycompile): store file name as String to keep the encoding. * parse.y (rb_parser_compile_string_path, rb_parser_compile_file_path): new functions to pass file name as a String. * parse.y (gettable_gen): return a copy of the original file name, not a copy in filesystem encoding. * vm_eval.c (eval_string_with_cref): use Qundef instead of "(eval)". * parse.y (yycompile): store file name as String to keep the encoding. * parse.y (rb_parser_compile_string_path, rb_parser_compile_file_path): new functions to pass file name as a String. * parse.y (gettable_gen): return a copy of the original file name, not a copy in filesystem encoding. * vm_eval.c (eval_string_with_cref): use Qundef instead of "(eval)". git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r45271: [Backport #9592] [Backport #9670]nagachika2014-03-303-5/+12
| | | | | | | | | * ext/openssl/ossl.c (ossl_make_error): check NULL for unknown error reasons with old OpenSSL, and insert a colon iff formatted message is not empty. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45472 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r45311: [Backport #9599]nagachika2014-03-212-4/+5
| | | | | | | | r45298 fix trivial bug $initial_size must be a size, not a status git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45379 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r45350: [Backport #9645]nagachika2014-03-204-1/+17
| | | | | | | | | | * variable.c (rb_const_set): delete existing entry on redefinition [Bug #9645] * test/ruby/test_const.rb (test_redefinition): test for leak git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45373 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r45298: [Backport #9599]nagachika2014-03-203-8/+28
| | | | | | | | | | | | test/ruby/envutil.rb: compare RSS to check memory leak * test/ruby/envutil.rb (Test::Test#assert_no_memory_leak): compare also RSS if available. * test/ruby/memory_status.rb (Memory::Status.parse): read string form of an instance. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45372 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r40930:nagachika2014-03-209-24/+52
| | | | | | | | | | | | * test/fiddle/test_c_struct_entry.rb, test/fiddle/test_c_union_entity.rb, test/fiddle/test_cparser.rb, test/fiddle/test_func.rb, test/fiddle/test_handle.rb, test/fiddle/test_import.rb, test/fiddle/test_pointer.rb: don't run test if the system don't support fiddle. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45371 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r45342:nagachika2014-03-153-4/+7
| | | | | | | * ext/.document: remove refinement from documentable directories. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45343 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r41598,r45181:nagachika2014-03-025-17/+41
| | | | | | | | | | | | | | | | | * eval_error.c (warn_printf): use rb_vsprintf instead so ruby specific extensions like PRIsVALUE can be used in format strings * eval_error.c (error_print): use warn_print_str (alias for rb_write_error_str) to print a string value instead of using RSTRING_PTR and RSTRING_LEN manually * eval.c (setup_exception): use PRIsVALUE instead of %s and RSTRING_PTR * eval.c (setup_exception): preserve exception class name encoding in debug mode messages. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45253 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r45225,r45240: [Backport #9578]nagachika2014-03-024-2/+22
| | | | | | | | | | | | | * ext/readline/readline.c (Init_readline): Use rl_hook_func_t instead of Function to support readline-6.3. (rl_hook_func_t is available since readline-4.2.) Reported by Dmitry Medvinsky. [ruby-core:61141] [Bug #9578] * ext/readline/extconf.rb (rl_hook_func_t): define as Function for very old readline versions. [ruby-core:61209] [Bug #9578] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45252 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r45178,r45179,r45180,r45183: [Backport #9568]nagachika2014-03-026-10/+50
| | | | | | | | | | | | eval.c: remove unneeded GC guard * eval.c (setup_exception): remove RB_GC_GUARD which is no longer needed since r41598. * eval.c (setup_exception): preserve errinfo across calling #to_s method on the exception. [ruby-core:61091] [Bug #9568] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45251 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r45187,r45205,r45212,r45213: [Backport #9570]nagachika2014-03-024-8/+37
| | | | | | | | | * numeric.c (ruby_num_interval_step_size): check signs and get rid of implementation dependent behavior of negative division. [ruby-core:61106] [Bug #9570] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45250 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* (merged partially from r42781)nagachika2014-03-023-29/+43
| | | | | | | * test/ruby/test_numeric.rb (assert_step): introduce assert_step. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45249 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r45220:nagachika2014-03-023-5/+10
| | | | | | | | * README.EXT.ja: [DOC] Fix typo "macro macro" @utenmiki [Fixes GH-551] https://github.com/ruby/ruby/pull/551 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45248 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r45101:nagachika2014-02-242-4/+4
| | | | | | | Fix a filename. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45166 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r45130: [Backport #9554]nagachika2014-02-223-2/+7
| | | | | | | | * ext/io/console/console.c (console_dev): need read access for conout$ because some functions need it. [Bug#9554] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45137 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r44568: [Backport #9399]nagachika2014-02-224-1/+19
| | | | | | | | * iseq.c (iseq_load): keep type_map to get rid of memory leak. based on a patch by Eric Wong at [ruby-core:59699]. [Bug #9399] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45108 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r44720: [Backport #9455]nagachika2014-02-223-2/+8
| | | | | | | | | * compile.c (iseq_build_from_ary_body): Use :blockptr instead of :block as hash key when loading serialized instruction sequences from arrays. [Bug #9455] [ruby-core:60146] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45106 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r45084: [Backport #9547]nagachika2014-02-223-3/+18
| | | | | | | | | | | | | | * ext/socket/init.c (wait_connectable): break if the socket is writable to avoid infinite loops on FreeBSD and other platforms which conforms to SUSv3. This problem cannot be reproduced with loopback interfaces, so it's hard to write test code. rsock_connect() and wait_connectable() are overly complicated, so they should be refactored, but I commit this fix as a workaround for the release of Ruby 1.9.3 scheduled on Feb 24. [ruby-core:60940] [Bug #9547] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45103 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* update patchlevel for the last commit.nagachika2014-02-221-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45102 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* (merged partially from r42927)nagachika2014-02-222-4/+31
| | | | | | | | | * lib/rubygems/core_ext/kernel_require.rb: Backport a fix for concurrent requires. [ruby-core:58918] [Backport #9224] see also https://github.com/rubygems/rubygems/pull/833 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45100 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r45066: [Backport #9550]nagachika2014-02-224-11/+38
| | | | | | | | | | * ext/socket/ancdata.c (bsock_sendmsg_internal): only retry on error (bsock_recvmsg_internal): ditto * test/socket/test_unix.rb: test above for infinite loop git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45098 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r45076: [Backport #9535]nagachika2014-02-229-5/+35
| | | | | | | | | | * class.c (rb_mod_init_copy): do nothing if copying self. [ruby-dev:47989] [Bug #9535] * hash.c (rb_hash_initialize_copy): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45096 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r45003: [Backport #9481]nagachika2014-02-215-16/+11
| | | | | | | | | | | | | | ext/psych/yaml: suppress warnings * ext/psych/yaml/emitter.c (WRITE_BREAK, PUT_BREAK): suppress unused-value warnings. * ext/psych/yaml/parser.c, ext/psych/yaml/scanner.c: suppress unused-but-set-variable warnings. * ext/psych/yaml/yaml_private.h (STACK_EMPTY): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45077 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r43750,r43940:nagachika2014-02-193-16/+26
| | | | | | | | | | * ext/openssl/lib/openssl/buffering.rb: [DOC] Fix HEREDOC comment for OpenSSL::Buffering which breaks overview because of RDoc bug * ext/openssl/lib/openssl/buffering.rb: Fix warning in copyright git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45053 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* partially merge revision(s) r44082: [Backport #9228]nagachika2014-02-193-1/+6
| | | | | | | * ext/.document: Add syslog/lib to documentable items. [Bug #9228] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45052 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r44527: [Backport #9377]nagachika2014-02-194-1/+27
| | | | | | | | | | * vm_insnhelper.c (vm_search_super_method): when super called in a bound UnboundMethod generated from a module, no superclass is found since the current defined class is the module, then call method_missing in that case. [ruby-core:59619] [Bug #9377] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45051 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r42844,r42845: [Backport #8865]nagachika2014-02-194-10/+241
| | | | | | | | | | | | | * lib/optparse.rb: The Integer acceptable now allows binary and hexadecimal numbers per the documentation. [ruby-trunk - Bug #8865] DecimalInteger, OctalInteger, DecimalNumeric now validate their input before converting to a number. [ruby-trunk - Bug #8865] * test/optparse/test_acceptable.rb: Tests for the above, tests for all numeric acceptables for existing behavior. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45050 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r43148,r43149,r43152: [Backport #8433]nagachika2014-02-194-7/+59
| | | | | | | | * thread.c (terminate_atfork_i): fix locking mutexes not unlocked in forks when not tracked in thread. [ruby-core:55102] [Bug #8433] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45049 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r42176:nagachika2014-02-192-6/+6
| | | | | | fix warning: shadowing outer local variable - path git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45048 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r42175:nagachika2014-02-183-8/+14
| | | | | | | | | envutil.rb: encoding * test/ruby/envutil.rb (Test::Unit::Assertions#assert_separately): specify the encoding of source. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45039 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r40866:nagachika2014-02-183-2/+8
| | | | | | | | * test/ruby/envutil.rb (assert_separately): require envutil in the child process too. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45038 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merge revision(s) r40833:nagachika2014-02-183-4/+9
| | | | | | Default script encoding is now UTF-8 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45035 b2dd03c8-39d4-4d8f-98ff-823fe69b080e