aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* string.c: check just before modificationnobu2017-06-182-1/+10
| | | | | | | | * string.c (rb_str_chomp_bang): check if modifiable after checking an argument and just before modification, as it can get frozen during the argument conversion to String. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59112 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* test_string.rb: chomp! frozen stringnobu2017-06-181-0/+3
| | | | | | | * test/ruby/test_string.rb (TestString#test_chomp): should raise if frozen. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59111 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* test/unit.rb: close jobservernobu2017-06-181-4/+7
| | | | | | | | * test/lib/test/unit.rb (Test::Unit::Parallel#flush_job_tokens): close jobserver auth fds aflter flush, not to release tokens more than acquired. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59110 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* capi/spec_helper.rb: suppress logonobu2017-06-181-0/+4
| | | | | | | | * spec/rubyspec/optional/capi/spec_helper.rb (compile_extension): suppress logo of nmake.exe to stderr. we want to show compiler warnings only. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59109 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * 2017-06-18svn2017-06-181-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59108 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* appveyor.yml: num of jobsnobu2017-06-181-1/+1
| | | | | | | * appveyor.yml (test_script): stop running too many workers to get rid of sporadic NoMemoryError. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59107 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* capi/spec_helper.rb: pass jobserver fdsnobu2017-06-172-3/+2
| | | | | | | | | | * spec/mspec/lib/mspec/commands/mspec.rb (MSpecMain#multi_exec): do not close GNU make jobserver auth fds. * spec/rubyspec/optional/capi/spec_helper.rb (compile_extension): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59106 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* capi/spec_helper.rb: use MAKE envnobu2017-06-171-1/+2
| | | | | | | | * spec/rubyspec/optional/capi/spec_helper.rb (compile_extension): prefer MAKE environment variable to hardcoded name if set by parent make. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59105 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * 2017-06-17svn2017-06-161-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59104 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* default.mspec: limit coresnobu2017-06-163-7/+8
| | | | | | | * spec/default.mspec (MSpecScript::JobServer#cores): limit max number of processors, not to acquire tokens more than necessary. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59103 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* pathname.rb: UNC root pathname needs a separatornobu2017-06-162-3/+5
| | | | | | | | | * ext/pathname/lib/pathname.rb (Pathname#plus): UNC root pathname needs a separator. File.basename returns "/" on UNC root, as well as sole drive letter, even if it does not end with a separator. [ruby-core:80900] [Bug #13515] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59102 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Merge psych-3.0.0.beta2 from https://github.com/ruby/psychhsbt2017-06-166-4/+54
| | | | | | | | | | | | It contains following changes from 3.0.0.beta1 * Preserve time zone offset when deserializing times https://github.com/ruby/psych/pull/316 * Enable YAML serialization of Ruby delegators https://github.com/ruby/psych/pull/158 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59101 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* require 'bigdecimal'ko12017-06-161-0/+1
| | | | | | | * test/json/json_parser_test.rb: this test needs bigdecimal. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59100 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Merge json-2.1.0 from https://github.com/flori/jsonhsbt2017-06-166-80/+120
| | | | | | https://github.com/flori/json/blob/master/CHANGES.md#2017-04-18-210 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59099 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * 2017-06-16svn2017-06-161-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59098 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* removed ruby_error_printnobu2017-06-163-9/+4
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59097 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Clear `DESTDIR` when running makeusa2017-06-151-1/+1
| | | | | | | | | | * spec/rubyspec/optional/capi/spec_helper.rb (compile_extension): `DESTDIR` is the drive letter of the ruby installed path as default on mswin, but not builddir of the ruby. this causes spec errors if the drive letter is different in the installed path and builddir. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59096 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Update to ruby/spec@c730f07eregon2017-06-151-10/+12
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59095 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * properties.svn2017-06-150-0/+0
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59094 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Update to ruby/spec@cd1b911eregon2017-06-1553-423/+316
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59093 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Update to ruby/mspec@d900a49eregon2017-06-1541-603/+500
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59092 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Revert r59084, see r57060nobu2017-06-151-6/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59091 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Don't pollute toplevel by an IRB internal methoda_matsuda2017-06-152-3/+5
| | | | | | | | | | | | | There actually are some libraries that requires 'irb' such as byebug, and when 'irb' is required, it requires irb/src_encoding.rb, then it defines the toplevel default_src_encoding method that is visible from anywhere in the end users' apps. Here's a quick oneliner that shows what's happening. % ruby -rpry-byebug -e 'p private_methods(false)' [:include, :using, :define_method, :public, :private, :DelegateClass, :default_src_encoding] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59090 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Prohibit SystemStackError while GC.ko12017-06-151-1/+4
| | | | | | | * vm_insnhelper.c (rb_threadptr_stack_overflow): fatal on GC [Bug #13662] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59089 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* common.mk: tweaked packages ordernobu2017-06-152-1/+5
| | | | | | | | | | | * common.mk (dist): tweaked packages order by $(DISTPKGS). .tar.gz comes first for the hash values in downloads page, then popular .zip. * tool/make-snapshot: "all" in -packages means all of the rest package types now. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59088 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* make-snapshot: colorize [ci skip]nobu2017-06-152-21/+33
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59087 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* make-snapshot: suppress output from 7z [ci skip]nobu2017-06-151-2/+8
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59086 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * 2017-06-15svn2017-06-151-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59085 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* make-snapshot: prefer default commands over 7z [ci skip]nobu2017-06-151-2/+6
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59084 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* proc.c: infect inspect resultnobu2017-06-142-0/+4
| | | | | | | * proc.c (method_inspect): the result should be infected by the object. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59083 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* test/ruby/test_method.rb: refined [ruby-core:81666] [Bug #13656]nobu2017-06-141-5/+6
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59082 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* openssl: import v2.0.4rhe2017-06-1414-52/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import Ruby/OpenSSL 2.0.4. Only bug (and typo) fixes. The full commit history since v2.0.3 (imported at r57482) can be found at: https://github.com/ruby/openssl/compare/v2.0.3...v2.0.4 This contains the fix for [Bug #11033]. ---------------------------------------------------------------- Jun Aruga (1): Update .travis.yml and Dockerfile Kazuki Yamaguchi (9): test/test_pkey_ec: do not use dummy 0 order test/test_ssl: fix typo in test_sysread_and_syswrite ssl: check return value of SSL_set_fd() Fix typos test/test_x509store: skip OpenSSL::TestX509Store#test_set_errors tool/sync-with-trunk: 'LASY' -> 'LAST' x509store: clear error queue after calling X509_LOOKUP_load_file() extconf.rb: simplify searching libraries logic Ruby/OpenSSL 2.0.4 SHIBATA Hiroshi (1): Fix typos Vladimir Rybas (1): Fix documentation for OpenSSL::Cipher#final nobu (2): openssl: fix broken openssl check openssl: fix broken openssl check usa (1): Search SSL libraries by testing various filename patterns git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59081 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* proc.c: skip prepended modulesnobu2017-06-142-1/+12
| | | | | | | | * proc.c (method_super_method): skip prepended modules and continue from the super class of the original class. [ruby-core:81666] [Bug #13656] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59080 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* compile.c: dump and error before allocationnobu2017-06-141-3/+4
| | | | | | | * compile.c (iseq_set_sequence): separate instruction dump and error, before allocation of sequence. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59079 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* simply call xfree().ko12017-06-141-2/+2
| | | | | | | | * compile.c (BADINSN_ERROR): mixing (void) and (int) will fail solaris compiler. [ruby-core:81668], [Bug #13658] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59078 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * 2017-06-14svn2017-06-141-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59077 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* remove OPT_CALL_CFUNC_WITHOUT_FRAME.ko12017-06-143-137/+1
| | | | | | | | | * vm_core.h (OPT_CALL_CFUNC_WITHOUT_FRAME): removed because nobody use it. This optimization tries to call C-methods without pushing VM frames, however no big improvements compare with this complexity. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59076 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * compile.c (dump_disasm_list_with_cursor): replace withnobu2017-06-131-12/+8
| | | | | | dump_disasm_list_with_cursor_dest. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59075 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* fix to free unallocated memory.ko12017-06-131-4/+4
| | | | | | | | * compile.c (iseq_set_sequence): initialize with NULL for line_info_table and generated_iseq and check NULL at BADINSN_ERROR. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* compile.c: refine error messagenobu2017-06-131-7/+14
| | | | | | | * compile.c (insn_set_sc_state): dump the whole instructions and mark the destination when label state mismatch. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59073 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * 2017-06-13svn2017-06-131-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59072 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* compile.c: refine error messagesnobu2017-06-131-10/+8
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59071 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* array.c: [DOC] Make it clear that #<< modifies receiverk0kubun2017-06-121-1/+4
| | | | | | | | This patch is sent from @selmertsx (morioka shuhei). [fix GH-1646] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59070 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* add a comment for rb_thread_mark()ko12017-06-121-7/+9
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59069 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* remove rb_blocking_region_buffer::oldubf.ko12017-06-121-14/+14
| | | | | | | | | | | * thread.c (rb_blocking_region_buffer): remove oldubf because ubf should be NULL just before ubf setting. * thread.c (set_unblock_function, reset_unblock_function): rename to unblock_function_set() and unblock_function_clear() respectively. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* unused functionsnobu2017-06-121-4/+2
| | | | | | | * thread_win32.c: native_cond_signal, native_cond_wait, native_cond_initialize, native_cond_destroy are not used now. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59067 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* remove ruby_kill() introduced for [Bug #7951].ko12017-06-125-31/+15
| | | | | | | | | | | | | | | | | | * thread.c (rbuy_kill): removed. This function is used with SIGSEGV, SIGBUS, SIGKILL, SIGILL, SIGFPE and SIGSTOP and these signals are affect immediately. So that `kill(2)' is enough for them. * signal.c (rb_f_kill): ditto. * vm_core.h (rb_thread_t::interrupt_cond): removed because only `ruby_kill()' uses this field. * test/ruby/test_signal.rb: Without this patch sending SIGSTOP to own process wait another interrupt even if another process sends SIGCONT. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59066 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* iseq.c: preserve encodingnobu2017-06-122-4/+13
| | | | | | * iseq.c (iseqw_inspect): preserve path encoding in the result. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59065 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* gc.c: duplicate rb_iseq_path by RSTRING_PTRnobu2017-06-121-1/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59064 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * proc.c (get_local_variable_ptr): return found env ptr. Returned envko12017-06-122-4/+26
| | | | | | | | | | will be used by write barrier at `bind_local_variable_set()'. [Bug #13605] * test/ruby/test_proc.rb: add a test for this issue. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59063 b2dd03c8-39d4-4d8f-98ff-823fe69b080e