Commit graph

29857 commits

Author SHA1 Message Date
nagachika
c5ce07eed7 merge revision(s) 42713: [Backport #8792]
* configure.in (sys/pstat.h): fix missing header check for
	  missing/setproctitle.c on HP-UX.  [ruby-core:56644] [Bug #8792]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42913 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-09-11 16:24:30 +00:00
nagachika
e4d528752a merge revision(s) 42596,42597,42598,42599: [Backport #8795]
* time.c (time_mload): ignore invalid offset and zone.
	  [ruby-core:56648] [Bug #8795]

	* time.c (time_mload): ignore auxiliary data, offset and zone, if
	  invalid.  [ruby-core:56648] [Bug #8795]

	* test/ruby/test_time.rb: use the in_timezone() helper
	  and define it at the top with other helpers.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42912 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-09-11 16:16:19 +00:00
nagachika
0891065082 merge revision(s) 42867: [Backport #8873]
* variable.c (classname): the name of class that has
	  non class id should not be nil. This bug was introduced
	  in r36577.

	* test/thread/test_cv.rb: test for change.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42911 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-09-11 15:27:13 +00:00
nagachika
a653ba0a4c merge revision(s) 42720: [Backport #8829]
* ext/zlib/zlib.c (zstream_run):  Fix handling of deflate streams that
	  need a dictionary but are being decompressed by Zlib::Inflate.inflate
	  (which has no option to set a dictionary).  Now Zlib::NeedDict is
	  raised instead of crashing.  [ruby-trunk - Bug #8829]

	* test/zlib/test_zlib.rb (TestZlibInflate):  Test for the above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-08-29 12:55:11 +00:00
nagachika
6588ba877a merge revision(s) 42724: [Backport #8238]
* vm_insnhelper.c (vm_call_method): a method entry refers the based
	  class/module, so should search superclass from the origin i-class
	  where the entry belongs to, to get rid of infinite loop when zsuper
	  in a prepended class/module.  [ruby-core:54105] [Bug #8238]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42726 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-08-29 12:50:38 +00:00
nagachika
335a9ef2f8 merge revision(s) 42100: [Backport #8806]
* ext/date/date_parse.c (rfc2822_cb): check if wday is given, since it
	  can be omitted.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42654 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-08-22 16:19:07 +00:00
nagachika
f79b8872ce merge revision(s) 42639: [Backport #8805]
* gc.c (getrusage_time): Fallback clock_gettime to getrusage when
	  clock_gettime fails.
	  Reported by Eric Saxby.  [ruby-core:56762] [Bug #8805]
	  


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42653 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-08-22 16:14:58 +00:00
nagachika
12b80db8a0 merge revision(s) 42282: [Backport #8785]
* parse.y: fix build error with bison-3.0.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42590 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-08-16 16:22:11 +00:00
nagachika
98905e2201 merge revision(s) 42421,42422: [Backport #8746]
* test/webrick/test_cgi.rb (TestWEBrickCGI#{start_cgi_server,test_cgi}):
	  mswin is not only mswin32 but also mswin64.
	  mswin is not only mswin32 but also mswin64. [Bug #8746]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42589 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-08-16 15:39:43 +00:00
nagachika
d15c1d10f6 merge revision(s) 42429: [Backport #8750]
* test/openssl/test_ssl.rb: Fix test for CVE-2013-4073.
	  Patch by Antonio Terceiro. [Bug #8750] [ruby-core:56437]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42588 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-08-16 15:37:07 +00:00
nagachika
cbf9816635 * lib/rubygems: update to RubyGems 2.0.6. the patch by drbrain.
[ruby-core:56633] [Backport #8787]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-08-16 15:35:06 +00:00
svn
5ac6776b0f * 2013-08-11
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-08-10 15:02:34 +00:00
nagachika
2f3915d4e4 merge revision(s) 42439,42453: [Backport #8752]
* test/coverage/test_coverage.rb (TestCoverage#test_big_code): use `1'
	  instead of `p' to get rid of a side effect.
	  Kernel#p without any argument seems to do nothing, but flushes stdout.
	  and, if stdout is redirected to file, fsync() will be called on
	  Windows.  so, when running test-all on Windows with redirection, such
	  as CI environment, this test took a lot of time.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42492 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-08-10 15:02:29 +00:00
nagachika
c632c92570 merge revision(s) 40001: [Backport #8109]
* win32/win32.c (wrename): use MoveFileExW instead of MoveFileW,
	  because the latter fails on cross device file move of some
	  environments.
	  fix [ruby-core:53492] [Bug #8109]
	  reported by mitchellh (Mitchell Hashimoto)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42375 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-08-04 13:42:25 +00:00
nagachika
9a37bfceec * version.h: increment patchlevel for r42370.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42373 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-08-04 12:21:04 +00:00
svn
95462cb04e * 2013-08-04
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42371 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-08-04 01:30:53 +00:00
nagai
317effe374 * ext/tk/extconf.rb: Default search_versions are set 8.5 and 8.4 only. At present, Tcl/Tk8.6 is not supported.
* ext/tk/extconf.rb: Fix typo. [ruby-core:56084] [Bug #8656]
* ext/tk/extconf.rb: Don't add "-ltk -ltcl" for MacOSX frameworks, because they may link improper libraries.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42370 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-08-04 01:30:46 +00:00
nagachika
5be2e8eb39 merge revision(s) 40080,40081: [Backport #8209]
* ext/extmk.rb (extmake): Use Logging.open to switch stdout and
	  stderr.  Delay Logging::log_close until the failure message is
	  written.  Write the failure message only if log file is opened.

	* lib/mkmf.rb (Logging.log_opened?): New method.
	  [ruby-dev:47215] [Bug #8209]

	* ext/extmk.rb (extmake): Invoke Logging::log_close in a ensure
	  clause.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42359 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-08-03 14:08:18 +00:00
nagachika
83466682e2 merge revision(s) 42223: [Backport #8702]
* lib/mkmf.rb (xsystem): expand environment variable in all macros not
	  expanded with RbConfig.  [Bug #8702]

	* test/mkmf/test_framework.rb (create_framework): replace all $@ not
	  only once.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42358 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-08-03 13:50:36 +00:00
nagachika
ab660694fe merge revision(s) 41777,41779: [Backport #8593]
* lib/mkmf.rb (have_framework): allow header file to check.
	  [ruby-core:55745] [Bug #8593]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42357 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-08-03 13:44:30 +00:00
nagachika
a1525108b8 merge revision(s) 42271: [Backport #8713]
* lib/uri/common.rb (URI.decode_www_form_component):
	  Don't raise error when str includes multibyte characters.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42355 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-08-03 13:27:01 +00:00
nagachika
65fcd2e738 merge revision(s) 42322:
nmake doesn't out put targets

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42353 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-08-03 11:47:25 +00:00
nagachika
6cd7a039a0 merge revision(s) 42178: [Backport #8687]
* rational.c (f_round_common): Rational is expected to be returned by
	  Rational#*, but mathn.rb breaks that assumption.  [ruby-core:56177]
	  [Bug #8687]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42217 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-28 13:04:45 +00:00
nagachika
a728dd2584 merge revision(s) 42212,42214: [Backport #8669]
* string.c: add internal API rb_str_locktmp_ensure().

	* io.c (io_fread): use rb_str_locktmp_ensure().
	  [ruby-core:56121] [Bug #8669]

	* test/ruby/test_io.rb: add a test for above.

	* io.c (io_getpartial): use rb_str_locktmp_ensure().
	  [ruby-core:56121] [Bug #8669]

	* io.c (rb_io_sysread): ditto.

	* test/ruby/test_io.rb: add tests for above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42216 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-28 12:58:48 +00:00
nagachika
0f1fb6ff36 merge revision(s) 42126: [Backport #8664]
* ext/openssl/ossl_asn1.c (asn1time_to_time):  Implement YYMMDDhhmmZ
	  format for ASN.1 UTCTime.  [ruby-trunk - Bug #8664]

	* test/openssl/test_asn1.rb:  Test for the above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42215 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-28 12:49:00 +00:00
nagachika
589da706be * lib/rubygems: Update to RubyGems 2.0.6. [ruby-core:56160]
[Backport #8682]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42170 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-25 15:42:22 +00:00
nagachika
7567977adc merge revision(s) 42153: [Backport #8645]
* lib/uri/generic.rb (find_proxy): raise BadURIError if the URI is
	  a relative URI. [Bug #8645]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-24 13:38:06 +00:00
nagachika
4654132145 * include/ruby/intern.h (rb_f_lambde): restore the declaration of
rb_f_lambda() for backword compatibility. and mark it as deprecated.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42145 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-23 16:40:53 +00:00
nagachika
e44b8eb3ad merge revision(s) 41933:
* lib/rubygems/psych_additions.rb: Ignore Psych docs here


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42121 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-22 16:37:04 +00:00
nagachika
14044110e0 merge revision(s) 41857:
* test/test_tracer.rb: catch up recent rubygems changes.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42118 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-22 16:36:19 +00:00
nagachika
b264a7ac99 * lib/rubygems: Update to RubyGems 2.0.5.
The patch provided by drbrain (Eric Hodel). [ruby-core:55896]
  [Backport #8617]

* test/rubygems:  Tests for the above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-22 16:33:18 +00:00
nagachika
65dc7d004e merge revision(s) 42103: [Backport #8662]
* vm_eval.c (eval_string_with_cref): use the given file name unless
	  eval even if scope is given.  additional fix for [Bug #8436].
	  based on the patch by srawlins at [ruby-core:56099] [Bug #8662].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42116 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-22 15:13:18 +00:00
nagachika
7029875b20 merge revision(s) 40232: [Backport #8251]
* test/drb/drbtest.rb (Drb{Core,Ary}#teardown): retry Process.kill
	  if it fails with Errno::EPERM on Windows (workaround).
	  [ruby-dev:47245] [Bug #8251]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42090 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-20 14:52:28 +00:00
nagachika
3207cfced7 merge revision(s) 40334: [Backport #8149]
* iseq.c (iseq_location_setup): re-use existing string when iseq has
	  the same path and absolute_path. [Bug #8149]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42089 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-20 14:45:51 +00:00
nagachika
3cdf8cf91d merge revision(s) 41466:
envutil.rb: keyword arguments

	* test/ruby/envutil.rb (invoke_ruby, assert_normal_exit),
  (assert_in_out_err, assert_ruby_status, assert_separately): use
  keyword arguments so that optional parameters can be omitted.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42088 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-20 14:22:24 +00:00
nagachika
896af10607 merge revision(s) 41915:
* sprintf.c: Fix typo patch by @hynkle [Fixes GH-357]
	  https://github.com/ruby/ruby/pull/357


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41958 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-13 15:18:40 +00:00
nagachika
0b92f56141 merge revision(s) 41906: [Backport #8620]
* man/ri.1: Incorrect use of .Dd macro [Bug #8620] by Tristan Hill


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41957 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-13 15:17:18 +00:00
nagachika
1e1223877b merge revision(s) 41902:
* lib/logger.rb: Use :call-seq: for method signature rdoc


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41954 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-13 15:16:09 +00:00
nagachika
474d53f87d merge revision(s) 41883,41885:
* test/net/http/test_http.rb (TestNetHTTP_v1_2#test_get,
	  TestNetHTTP_v1_2_chunked#test_get): shoudn't check
	  HttpResponse#decode_content if Zlib is not available.
	  ko1 complained via IRC.
	  TestNetHTTP_v1_2_chunked#test_get): shouldn't check


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41953 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-13 15:13:21 +00:00
nagachika
e931e27add merge revision(s) 41077,41105: [Backport #8485] [Backport #8500] [Backport #8578]
* ext/date/date_core.c: fixed a bug [ruby-core:55295].  reported
	  by Riley Lynch.

	* ext/date/date_core.c: fixed coding error [ruby-core:55337].
	  reported by Riley Lynch.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41952 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-13 14:52:27 +00:00
nagachika
ad22d67e2b merge revision(s) 41871: [Backport #8608]
* ext/date/date_parse.c (date_zone_to_diff): [ruby-core:55831].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41951 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-13 14:47:56 +00:00
nagachika
34b1d25015 merge revision(s) 41863:
Module extended doc by @PragTob [fixes GH-335]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41950 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-13 14:37:19 +00:00
nagachika
ce75312a67 merge revision(s) 41862:
fixup stying of `Json#generate` parameter docs by @daveworth [fixes GH-339]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41949 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-13 14:36:33 +00:00
nagachika
725da5a34c merge revision(s) 41861:
Add a missing line for rb_str_equal of string.c by @JuanitoFatas [fixes GH-353]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41948 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-13 14:36:03 +00:00
nagachika
58f44c469e merge revision(s) 41854,41867:
* object.c: Fix rdoc for Kernel#<=>. [Fix GH-352]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41947 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-13 14:35:04 +00:00
nagachika
6e3563c215 merge revision(s) 41853: [Backport #8633]
* lib/fileutils.rb (FileUtils#mode_to_s): Define mode_to_s() also
	  as singleton method, or FileUtils.chmod fails in verbose mode.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41946 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-13 14:32:56 +00:00
nagachika
26ade0f2f6 merge revision(s) 41851:
* lib/fileutils.rb (FileUtils#chown, FileUtils#chown_R): If user
	  and group are both nil, print ":".


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41945 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-13 14:27:32 +00:00
nagachika
57ec0834a1 merge revision(s) 41839,41841:
* bignum.c (biglsh_bang): Fix bignum digits under-run.

	* bignum.c (bigrsh_bang): Fix bignum digits overrun.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41944 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-13 14:25:36 +00:00
nagachika
e62660c920 merge revision(s) 41815,41816: [Backport #8606]
* configure.in (RUBY_DTRACE_POSTPROCESS): dtrace version SUN D 1.11
	  introduces a check in the dtrace compiler to ensure that probes
	  actually exist. If there are no probes, then the -G step will
	  fail. As this test is only being used to determine whether -G is
	  necessary (for instance, on OSX it is not), adding a real probe to
	  the conftest allows it to succeed on newer versions of dtrace.
	  Patch by Eric Saxby <sax AT livinginthepast.org> at
	  [ruby-core:55826].  [Fix GH-351], [Bug #8606].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41943 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-13 14:13:20 +00:00
nagachika
7c83af2d7b merge revision(s) 41807:
* test/openssl/test_x509crl.rb: Remove unused variable.
	  [ruby-core:53501] [Bug #8114]
	  Thanks, Vipul Amler, for pointing this out!


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41941 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-07-13 13:42:11 +00:00