summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-04-11merge revision(s) 39742,39743: [Backport #8005]nagachika
assertions.rb: private flag * lib/test/unit/assertions.rb (assert_respond_to): accept optional include-private flag. * vm_method.c (rb_export_method): directly override the flag of method defined in prepending class too, not adding zsuper entry. [ruby-core:53106] [Bug #8005] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40252 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-11merge revision(s) 39544,39546: [Backport #7992]nagachika
* lib/fileutils.rb: Revert r34669 which altered the way metaprogramming in FileUtils occurred. [ruby-trunk - Bug #7958] * test/fileutils/visibility_tests.rb: Refactored tests of FileUtils options modules to expose bug found in #7958 * test/fileutils/test_dryrun.rb: ditto. * test/fileutils/test_nowrite.rb: ditto. * test/fileutils/test_verbose.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40251 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-11merge revision(s) 39697,39701,39716,39740,39751: [Backport #8069]nagachika
* win32/file.c (rb_file_expand_path_internal): Expand home directory when used as second parameter (dir_string). [ruby-core:53168] [Bug #8034] * test/ruby/test_file_exhaustive.rb: add test to verify. * win32/file.c (get_user_from_path): add internal function that retrieves username from supplied path (refactored). * win32/file.c (rb_file_expand_path_internal): refactor expansion of user home to use get_user_from_path and cover dir_string corner cases. [ruby-core:53168] [Bug #8034] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40249 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-07merge revision(s) 39810: [Backport #8145]nagachika
* gc.c: Fix unlimited memory growth with large values of RUBY_FREE_MIN. patched by tmm1(Aman Gupta). [Bug #8095] [ruby-core:53405] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40177 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-07merge revision(s) 39811: [Backport #8146]nagachika
* gc.c: Avoid unnecessary heap growth. patched by tmm1(Aman Gupta). [Bug #8093] [ruby-core:53393] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40176 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-06merge revision(s) 39858: [Backport #8135]nagachika
* parse.y (simple_re_meta): escape all closing characters, not only round parenthesis. [ruby-core:53578] [Bug #8133] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40169 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-06merge revision(s) 39812: [Backport #8147]nagachika
* gc.c: Improve accuracy of objspace_live_num() and allocated/freed counters. patched by tmm1(Aman Gupta). [Bug #8092] [ruby-core:53392] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40168 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-06merge revision(s) 39785: [Backport #8108]nagachika
* array.c: fix rdoc. [ruby-core:53485] [ruby-trunk - Bug #8108] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40167 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-04merge revision(s) 40090:nagachika
* ext/openssl/ossl_bn.c (ossl_bn_initialize): fix can't create from bn. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40113 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-03merge revision(s) 39725: [Backport #8054]nagachika
* lib/resolv-replace.rb (TCPSocket#initialize): resolve the 3rd argument only if non-nil value is given. [ruby-dev:47150] [ruby-trunk - Bug #8054] reported and analyzed by mrkn. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40089 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-03merge revision(s) 39718: [Backport #8001] [Backport #8023]nagachika
* Merge Onigmo d4bad41e16e3eccd97ccce6f1f96712e557c4518. fix lookbehind assertion fails with /m mode enabled. [Bug #8023] fix \Z matches where it shouldn't. [Bug #8001] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40088 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-03merge revision(s) 39650: [Backport #8043]nagachika
* marshal.c (w_extended): check for prepended object. [ruby-core:53206] [Bug #8043] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40087 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-02merge revision(s) 40069:nagachika
win32.c: missing break * win32/win32.c (constat_attr): fix missing break. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40075 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-02merge revision(s) 40048:nagachika
fix typo: s/@ca_cert/@cacert/ git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-26merge revision(s) 39806: [Backport #8118]nagachika
* vm_exec.c: Correct predefined macro name. This typo is introduced by r36534 and should be backported to ruby_2_0_0. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39954 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-26merge revision(s) 39547: [Backport #7972] [Backport #7974]nagachika
* Merge Onigmo 0fe387da2fee089254f6b04990541c731a26757f v5.13.3 [Bug#7972] [Bug#7974] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39953 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-26merge revision(s) 39509,39511: [Backport #7961]nagachika
* lib/rexml/document.rb: move entity_expansion_limit accessor to ... * lib/rexml/rexml.rb: ... here to make rexml/text independent from REXML::Document. It causes circular require. * lib/rexml/document.rb (REXML::Document.entity_expansion_limit): deprecated. * lib/rexml/document.rb (REXML::Document.entity_expansion_limit=): deprecated. * lib/rexml/text.rb: add missing require "rexml/rexml" for REXML.entity_expansion_limit. Reported by Robert Ulejczyk. Thanks!!! [ruby-core:52895] [Bug #7961] * lib/rexml/document.rb: move entity_expansion_text_limit accessor to ... * lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit): * lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit=): REXML.entity_expansion_text_limit. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39952 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-26merge revision(s) 39739: [Backport #8081]nagachika
* object.c (Init_Object): remove Module#used, which has been introduced in Ruby 2.0 by mistake. [Bug #7916] [ruby-core:52719] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39951 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-24merge revision(s) 39677,39695: [Backport #8068]nagachika
* complex.c: described syntax of string form. * rational.c: ditto. * complex.c: edited rdoc. * rational.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39918 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-24merge revision(s) 39625,39626: [Backport #8008]nagachika
compile.c: calc in int * compile.c (iseq_compile_each): calculate argc as int, not as Fixnum. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39917 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-24merge revision(s) 39632: [Backport #8013]nagachika
* lib/webrick/httpproxy.rb: Fix typos in HTTPProxyServer [Bug #8013] Patch by Nobuhiro IMAI [ruby-core:53127] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39916 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-24merge revision(s) 39614: [Backport #8033]nagachika
configure.in: fix unexpand_shvar * configure.in (unexpand_shvar): remove guarding quotes at last. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39915 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-24merge revision(s) 39627: [Backport #8008]nagachika
* compile.c (iseq_compile_each): pass keyword arguments to zsuper, with current values. [ruby-core:53114] [Bug #8008] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39914 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-24merge revision(s) 39595: [Backport #8014]nagachika
* ext/objspace/objspace.c (count_nodes): count also newly added nodes, and fix key for unknown node. patch by tmm1 (Aman Gupta) in [ruby-core:53130] [Bug #8014] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39913 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-24merge revision(s) 39601 and 39602(partially): [Backport #7983]nagachika
* class.c (rb_prepend_module): check redefinition of built-in optimized methods. [ruby-dev:47124] [Bug #7983] * vm.c (rb_vm_check_redefinition_by_prepend): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39912 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-24merge revision(s) 39578: [Backport #8009]nagachika
* Makefile.in (miniruby, ruby): move MAINLIBC because linker arguments must appear after object files with newer versions of gcc. patch by tmm1 (Aman Gupta) in [ruby-core:53121] [Bug #8009] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39911 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-24merge revision(s) 39536: [Backport #7989]nagachika
* iseq.c (iseq_data_to_ary): fix condition. r34303 introduces a bug to avoid all line information from a result of ISeq#to_a. This is a regression problem from 2.0.0p0. * test/ruby/test_iseq.rb: add a test of lines after ISeq#to_a. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39910 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-24merge revision(s) 39507,39508: [Backport #7963]nagachika
* tool/mkconfig.rb: reconstruct comma separated list values. a command line to Windows batch file is splitted not only by spaces and equals sign but also by commas and semicolons. command line to Windows batch file is split not only by spaces and equal signs but also by commas and semicolons. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39909 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20merge revision(s) 39835: [Backport #8058]nagachika
* test/rubygems/test_gem_installer.rb (test_install_extension_flat): use ruby in build directory in case ruby is not installed. [ruby-core:53265] [Bug #8058] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39852 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20merge revision(s) 39809,39834,39837: [Backport #8132]nagachika
* test/win32ole/test_err_in_callback.rb (TestErrInCallBack#test_err_in_callback): shouldn't create a file in source directory. * test/win32ole/test_err_in_callback.rb (TestErrInCallBack#setup): use relative path to get rid of "too long commandline" error. the top of build directory. * test/win32ole/test_err_in_callback.rb (TestErrInCallBack#setup): allow using different root for source and build directories. this may fixes a minor problem of r39834. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39851 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20merge revision(s) 39781,39783: [Backport #8080]nagachika
missing.h: build fix * include/ruby/missing.h: include time.h and sys/time.h iff needed, but excepct for sys/time.h on linux to get rid of glibc bug. * include/ruby/missing.h: removed __linux__. it's unnecessary. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39850 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20merge revision(s) 39779: [Backport #8080]nagachika
Makefile.sub: fix mswin build * win32/Makefile.sub (config.h): fix mswin build, also VC has time.h and struct timeval. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39849 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20merge revision(s) 39777: [Backport #8080]nagachika
mingw build fix * configure.in: struct timeval is defined in winsock2.h on mingw. * include/ruby/missing.h: include time.h for time_t, and sys/time.h for timeval and timespec. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39848 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20merge revision(s) 39200: [Backport #8080]nagachika
* configure.in: move OS specific header/function knowledge before automatic header tests. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39847 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20merge revision(s) 39174: [Backport #8080]nagachika
* configure.in: move header files check to the beginning of "header and library section". test rlim_t with sys/types.h and sys/time.h for MirOS BSD. sys/types.h and sys/time.h is gurded by #ifdef and the above move is required for this change. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39846 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20merge revision(s) 39198: [Backport #8080]nagachika
* configure.in: move the test for -march=i486 just after RUBY_UNIVERSAL_ARCH/RUBY_DEFAULT_ARCH. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39845 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20merge revision(s) 39162,39163: [Backport #8080]nagachika
* configure.in: change CFLAGS temporally to test ARCH_FLAG="-march=i486". git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39844 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20merge revision(s) 39160: [Backport #8080]nagachika
* configure.in: don't define ARCH_FLAG="-march=i486" if it causes compilation problem. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39843 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20merge revision(s) 39775: [Backport #8080]nagachika
* thread.c: disabled _FORTIFY_SOURCE for avoid to hit glibc bug. [Bug #8080] [ruby-core:53349] * test/ruby/test_io.rb (TestIO#test_io_select_with_many_files): test for the above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39840 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20merge revision(s) 39774: [Backport #8080]nagachika
* include/ruby/missing.h (__syscall): moved to... * io.c: here. because __syscall() is only used from io.c. * include/ruby/missing.h: move "#include <sys/type.h>" to .... * include/ruby/intern.h: here. because it was introduced for fixing NFDBITS issue. [ruby-core:05179]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39839 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-20merge revision(s) 39772,39773: [Backport #8080]nagachika
* configure.in: check struct timeval exist or not. * include/ruby/missing.h (struct timeval): check HAVE_STRUCT_TIMEVAL properly. and don't include sys/time.h if struct timeval exist. * file.c: include sys/time.h explicitly. * random.c: ditto. * thread_pthread.c: ditto. * time.c: ditto. * ext/date/date_strftime.c: ditto. * include/ruby/missing.h (struct timespec): include <sys/time.h> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39838 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-19merge revision(s) 39525: [Backport #8102]nagachika
configure.in: escape double-quotes * configure.in (unexpand_shvar): escape double-quotes in backquotes in double-quotes for some shells. [Bug #7959] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39825 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-17merge revision(s) 39731: [Backport #7991]nagachika
* lib/rubygems/commands/setup_command.rb: Don't delete non-rubygems files when installing RubyGems. * test/rubygems/test_gem_commands_setup_command.rb: Test for the above. * lib/rubygems/ext/ext_conf_builder.rb: Use full path to siteconf.rb in case the extconf.rb changes directories (like memcached does). * lib/rubygems/package.rb: Remove double slash from path. * test/rubygems/test_gem_package.rb: Test for the above. * test/rubygems/test_gem_package_old.rb: ditto. * lib/rubygems/source.rb: Revert automatic HTTPS upgrade * lib/rubygems/spec_fetcher.rb: ditto. * test/rubygems/test_gem_remote_fetcher.rb: ditto. * test/rubygems/test_gem_source.rb: ditto. * test/rubygems/test_gem_spec_fetcher.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39802 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-17merge revision(s) 39696: [Backport #7991]nagachika
* lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build): it is impossible to predict which file will be installed to where, by the arguments, so use intermediate destination directory always. [Bug #7698] * lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build): it is impossible to predict which file will be installed to where, by the arguments, so use intermediate destination directory always. [Bug #7698] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39801 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-17merge revision(s) 39621,39622: [Backport #7991]nagachika
* lib/rubygems/commands/setup_command.rb: Install .pem files. * test/rubygems/test_gem_commands_setup_command.rb: Test for the above. * lib/rubygems/spec_fetcher.rb: Test HTTPS upgrade with URI::HTTPS, not URI::HTTP. Fixes bug in automatic HTTPS upgrade. * test/rubygems/test_gem_spec_fetcher.rb: Test for the above. * lib/rubygems.rb: Version 2.0.2 * lib/rubygems/test_utilities.rb: Ensure scheme and uri class match. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39800 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-17merge revision(s) 39608: [Backport #7749]nagachika
* test/rubygems/test_require.rb: Fix tests when 'a.rb' exists. [ruby-trunk - Bug #7749] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39799 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-17merge revision(s) 39607: [Backport #7713]nagachika
* lib/rubygems.rb: Allow specification of directory permissions. [ruby-trunk - Bug #7713] * test/rubygems/test_gem.rb: Test for the above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39798 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-17merge revision(s) 39606,39609: [Backport #8019]nagachika
* lib/rubygems/commands/query_command.rb: Only fetch remote specs when showing details. [ruby-trunk - Bug #8019] RubyGems bug #487 * lib/rubygems/remote_fetcher.rb: ditto. * lib/rubygems/security/policy.rb: ditto. * test/rubygems/test_gem_commands_query_command.rb: Test for the above. * lib/rubygems/security.rb: Make OpenSSL optional for RubyGems. * lib/rubygems/commands/cert_command.rb: ditto. * lib/rubygems/config_file.rb: Display file with YAML error, not ~/.gemrc * lib/rubygems/remote_fetcher.rb: Only create gem subdirectories when installing gems. * lib/rubygems/dependency_resolver.rb: ditto. * lib/rubygems/test_utilities.rb: ditto. * test/rubygems/test_gem_commands_fetch_command.rb: Test for the above. * lib/rubygems/spec_fetcher.rb: Only try to upgrade http://rubygems.org to HTTPS * test/rubygems/test_gem_spec_fetcher.rb: Test for the above. * lib/rubygems.rb: Update win_platform? check for JRuby compatibility. * test/rubygems/test_gem_installer.rb: Update for Ruby 1.9.2 compatibility * test/rubygems/test_gem_spec_fetcher.rb: Removed unused variable. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39797 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-17merge revision(s) 39603: [Backport #7991]nagachika
for [Bug #7698] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39796 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-03-17merge revision(s) 39597: [Backport #7991]nagachika
* lib/rubygems.rb: Bump version to 2.0.1 for upcoming bugfix release * lib/rubygems/ext/ext_conf_builder.rb: Restore ruby 1.8 compatibility for [Bug #9698] * test/rubygems/test_gem_installer.rb: Ditto. * lib/rubygems/package.rb: Restore ruby 1.8 compatibility. * test/rubygems/test_gem_dependency_installer.rb: Fix warnings git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39795 b2dd03c8-39d4-4d8f-98ff-823fe69b080e