Commit graph

29857 commits

Author SHA1 Message Date
nagachika
71fba6871f merge revision(s) 40411:
fix minor code comment typos

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40424 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-23 13:25:06 +00:00
nagachika
7194acb65d merge revision(s) 40182,40221: [Backport #8311]
test_curses.rb: add sentinel

	* test/test_curses.rb (TestCurses#run_curses): add sentinel to get rid
  of read pty output after the child process terminated, which causes
  EIO on Linux.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40421 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-23 11:19:30 +00:00
nagachika
88d0a18c9f merge revision(s) 40135,40148,40173: [Backport #8165]
* load.c (features_index_add): use rb_str_subseq() to specify C string
	  position properly to fix require non ascii path.
	  [ruby-core:53733] [Bug #8165]

	* test/ruby/test_require.rb (TestRequire#test_require_nonascii_path):
	  a test for the above.

	* test/ruby/test_require.rb (TestRequire#test_require_nonascii_path):
	  fix load path for encoding to run the test as stand-alone.

	* test/ruby/test_require.rb (TestRequire#test_require_nonascii_path):
	  RUBY_PLATFORM should escape as Regexp,
	  because RUBY_PLATFORM may contain '.'.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40398 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-20 15:14:51 +00:00
nagachika
c1ca05af16 merge revision(s) 39644,39646,39647,39874,39898: [Backport #8048]
* load.c (features_index_add_single, rb_feature_p): store single index
	  as Fixnum to reduce the number of arrays for the indexes.  based on
	  the patch by tmm1 (Aman Gupta) in [ruby-core:53216] [Bug #8048].

	* load.c (rb_feature_p), vm_core.h (rb_vm_struct): turn
	  loaded_features_index into st_table.  patches by tmm1 (Aman Gupta)
	  in [ruby-core:53251] and [ruby-core:53274] [Bug #8048]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40397 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-20 15:13:50 +00:00
nagachika
80ecaa1777 merge revision(s) 40345: [Backport #8283]
* dir.c (glob_helper): should skip dot directories only for recursion,
	  but should not if matching to the given pattern.  [ruby-core:54387]
	  [Bug #8283]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40394 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-20 14:40:53 +00:00
nagachika
62ff805f22 merge revision(s) 40362: [Backport #7997]
* lib/cgi/cookie.rb(CGI::Cookie.parse): add require
  for standalone require 'cgi/cookie' .[Bug #7997]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40389 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-19 17:41:23 +00:00
nagachika
2bc8289441 merge revision(s) 40117,40118,40333: [Backport #8222]
* test/test_curses.rb: tests for getch.
	* ext/curses/curses.c (Init_curses): fix implementation function,
	  crmode should be same as cbreak.  [ruby-core:54013] [Bug #8222]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40388 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-19 17:39:44 +00:00
nagachika
2e607b7ff3 merge revision(s) 40304: [Backport #8240]
* ext/openssl/ossl_ssl.c: Correct shutdown behavior w.r.t GC.

	* test/openssl/test_ssl.rb: Add tests to verify correct behavior.
	[Bug #8240] Patch provided by Shugo Maeda. Thanks!


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40387 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-19 17:16:37 +00:00
nagachika
6ba7e6cc60 merge revision(s) 40102: [Backport #8234]
* thread_pthread.c (ruby_init_stack): Avoid using uninitialized value.
	  stackaddr and size are not set if get_stack() fails.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40386 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-19 17:03:11 +00:00
nagachika
7e970d34ed merge revision(s) 40103: [Backport #8235]
* thread_pthread.c: Fixes wrong scopes of #if USE_SLEEPY_TIMER_THREAD
	  .. #endif sections.  This fixes a build error on NativeClient.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40385 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-19 16:54:51 +00:00
nagachika
8c43fc0217 merge revision(s) 40276: [Backport #8210]
* Merge Onigmo 5.13.4 f22cf2e566712cace60d17f84d63119d7c5764ee.
	  [bug] fix problem with optimization of \z (Issue #16) [Bug #8210]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40384 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-19 16:40:32 +00:00
nagachika
80002f8e46 merge revision(s) 40260,40377: [Backport #8260]
* vm_insnhelper.c (vm_callee_setup_keyword_arg): non-symbol key is not
	  a keyword argument, keep it as an positional argument.
	  a keyword argument, keep it as a positional argument.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40381 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-19 16:28:55 +00:00
nagachika
26de612013 merge revision(s) 40000: [Backport #8097]
* thread.c (rb_mutex_synchronize_m): yield no block params.  patch by
	  splattael (Peter Suschlik) in [ruby-core:53773] [Bug #8097].
	  fix GH-266.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40380 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-19 16:16:55 +00:00
nagachika
a569165d3e merge revision(s) 40205: [Backport #8236]
* compile.c (iseq_compile_each): append keyword hash to argument array
	  to splat if needed.  [ruby-core:54094] [Bug #8236]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40379 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-19 16:02:09 +00:00
nagachika
1ccf489ad5 merge revision(s) 40374: [Backport #8292]
* README.EXT.ja (Data_Wrap_Struct): Remove a description about
	  orphan argument. Oh, I renamed the argument name without
	  changing description at r36180... Sorry....
	  Patch by Makoto Kishimoto. Thanks!!! [ruby-dev:47269] [Bug #8292]

	* README.EXT.ja (Data_Make_Struct): Add a sample code that describes
	  how it works.
	  Patch by Makoto Kishimoto. Thanks!!! [ruby-dev:47269] [Bug #8292]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40378 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-19 15:32:14 +00:00
nagachika
a66491efa5 merge revision(s) 40327:
fix typo by @zsalzbank [fix GH-289]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40339 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-17 14:26:57 +00:00
nagachika
fb6713bd9f merge revision(s) 39600:
test_method.rb: reduce iteration

	* test/ruby/test_method.rb (TestMethod#test_bound_method_entry):
  reduce iteration.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40326 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-16 16:20:05 +00:00
nagachika
b4909876ef merge revision(s) 40322:
fix ENV.to_a rdoc example by @benolee [fix GH-288]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40325 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-16 14:09:00 +00:00
nagachika
b3f5b73ac2 merge revision(s) 40318:
fixed wrong value by @taksatou [fix GH-287]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40323 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-16 13:49:52 +00:00
nagachika
3a645975f5 merge revision(s) 40181: [Backport #8183]
* lib/cgi/util.rb (CGI::unescapeHTML): fix Hexadecimal numeric character.
  [Bug #8183]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40315 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-15 16:34:55 +00:00
nagachika
e3dbba340e merge revision(s) 39814,39815: [Backport #8117]
* configure.in: Fix c++ compiler auto-selection not only for
	  Darwin 11.x, but also the other versions of Darwin.

	* configure.in: set ac_cv_prog_cxx if CXX is supplied.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40314 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-15 16:33:31 +00:00
nagachika
36eb336678 revert r40311(merge revision(s) 40117,40118).
It breaks rubyci tests.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-15 16:27:33 +00:00
nagachika
ed1d6660d1 merge revision(s) 40124: [Backport #8220]
* compile.c (iseq_compile_each): fix of defined? with empty
	  expression.  [ruby-core:53999] [Bug #8220]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40312 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-15 15:28:52 +00:00
nagachika
d9aa81ea3e merge revision(s) 40117,40118: [Backport #8222]
* test/test_curses.rb: tests for getch.
	* ext/curses/curses.c (Init_curses): fix implementation function,
	  crmode should be same as cbreak.  [ruby-core:54013] [Bug #8222]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40311 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-15 14:19:55 +00:00
nagachika
7514d35dc7 merge revision(s) 40301:
* dir.c (File.fnmatch): fix typo in documentation

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40310 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-15 14:09:18 +00:00
nagachika
8a28816625 merge revision(s) 40299:
* string.c (String#gsub): fix typo in documentation

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40309 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-15 14:04:09 +00:00
nagachika
108d1632e1 merge revision(s) 39967: [Backport #8193]
* time.c (num_exact): use to_r method only if to_int method is
	  available.
	  [ruby-core:53764] [Bug #8173] reported by Hiro Asari.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40298 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-14 15:45:42 +00:00
nagachika
844f78f556 merge revision(s) 39817: [Backport #8116]
* ext/objspace/objspace.c: Fix typo in doc. Patch by Sho Hashimoto.
	  [Bug #8116] [ruby-dev:47177]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40297 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-14 15:22:58 +00:00
nagachika
f3c5e92dc7 merge revision(s) 40015: [Backport #8197]
doumentation by @toolmantim [GH fixes #270]

 * timeout.rb: Document Timeout::timeout 0 and nil argument behavior



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40296 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-14 15:20:33 +00:00
nagachika
3ed62b8e81 merge revision(s) 40014: [Backport #8199]
Document the default Net timeout values by @toolmantim [GH fixes #269]

 * lib/net/{ftp,http,pop,smtp}.rb: added documentation for default values.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40295 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-14 15:19:46 +00:00
nagachika
c6c33ec6ff merge revision(s) 40013,40032: [Backport #8188]
* class.c (HAVE_METACLASS_P): should check FL_SINGLTON flag before get
	  instance variable to get rid of wrong warning about __attached__.
	  [ruby-core:53839] [Bug #8188]

	* class.c (HAVE_METACLASS_P): should check FL_SINGLETON flag before get


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40294 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-14 15:17:44 +00:00
nagachika
5525ff192c merge revision(s) 40003: [Backport #7996]
* win32/file.c (code_page): use cp1252 instead of cp20127 as US-ASCII.
	  fix [ruby-core:53079] [Bug #7996]
	  reported and patched by mmeltner (Michael Meltner).
	  reported by mitchellh (Mitchell Hashimoto).


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-14 15:13:32 +00:00
nagachika
5b2ea4e53b merge revision(s) 39987,39993,39998: [Backport #8174]
* include/ruby/io.h: rename SVR3,4 member names as POSIX compliants,
	  to get rid of conflict on AIX.  [ruby-core:53765] [Bug #8174]

	* include/ruby/io.h: undef POSIX compliants names on AIX, which are no
	  longer needed.  patch suggested by edelsohn (David Edelsohn) in
	  [ruby-core:53815].  [Bug #8174]

	* include/ruby/io.h: undef POSIX compliant names on AIX, which are no

	* include/ruby/io.h: rename SVR3,4 member names as POSIX compliant,


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40292 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-14 15:10:30 +00:00
nagachika
303568e605 merge revision(s) 39994: [Backport #6504]
* lib/mkmf.rb (configuration): not include all CFLAGS in CXXFLAGS, to
	  use different set than C for C++.  [ruby-core:45273] [Bug #6504]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40291 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-14 14:55:53 +00:00
nagachika
aa69372cf8 merge revision(s) 40216: [Backport #8266]
* ext/fiddle/closure.c (initialize): check mprotect's return value.
	  If mprotect is failed because of PaX or something, its function call
	  will cause SEGV.
	  20130401T210301Z.diff.html.gz


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40290 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-14 14:47:14 +00:00
nagachika
5e17378c44 merge revision(s) 39958,39989: [Backport #8169]
* lib/mkmf.rb (MAIN_DOES_NOTHING): force to refer symbols for tests
	  to be preserved.  [ruby-core:53745] [Bug #8169]

	* lib/mkmf.rb (MAIN_DOES_NOTHING): ensure symbols for tests to be
	  preserved.  [ruby-core:53745] [Bug #8169]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40289 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-14 14:39:13 +00:00
nagachika
7bc0cea739 merge revision(s) 40163: [Backport #8228]
* configure.in (AC_CHECK_HEADERS): atomic.h for Solaris atomic_ops.

	* ruby_atomic.h: Skip using Solaris10 atomic_ops on Solaris 9 or
	  earlier if atomic.h is not available. [ruby-dev:47229] [Bug #8228]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40285 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-13 18:04:57 +00:00
nagachika
08c3e8edbd merge revision(s) 39766,39769: [Backport #8101]
* time.c (GetTimeval): check if already initialized instance.

	* time.c (GetNewTimeval): check if newly created instance.

	* time.c (time_init_0, time_init_1, time_init_copy, time_mload): must
	  be newly created instance.  [ruby-core:53436] [Bug #8099]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40282 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-13 17:37:39 +00:00
nagachika
59f8d5d103 merge revision(s) 39877,39881: [Backport #8153] [Backport #8154]
* array.c: Avoid zip bug by not using obsolete rb_check_block_call
	  [Bug #8153]

	* vm_eval.c (check_funcall_respond_to): preserve passed_block, which
	  is modified in vm_call0_body() via vm_call0(), and caused a bug of
	  rb_check_funcall() by false negative result of rb_block_given_p().
	  re-fix [ruby-core:53650] [Bug #8153].
	  [ruby-core:53653] [Bug #8154]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40281 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-13 17:19:57 +00:00
nagachika
5a34781bd3 merge revision(s) 40274:
* array.c: rdoc tweak for include?

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40279 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-13 13:40:59 +00:00
nagachika
00a1a0e4a5 merge revision(s) 40250:
fix typo


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-12 17:03:32 +00:00
nagachika
71208c0284 merge revision(s) 39860: [Backport #8150]
* marshal.c (marshal_dump, marshal_load): workaround for segv on
	  Intel Solaris compiled with Oracle SolarisStudio 12.3.
	  Partly revert r38174. [ruby-core:52042] [Bug #7805]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40257 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-11 19:23:02 +00:00
nagachika
1392882f35 merge revision(s) 39822,39856: [Backport #8141]
* string.c (rb_str_conv_enc_opts): convert with one converter, instead
	  of re-creating converters for each buffer expansion.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40256 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-11 19:13:29 +00:00
nagachika
2babe834b1 merge revision(s) 39842: [Backport #8130]
* lib/mkmf.rb (find_library): fix to format message.
	  [ruby-core:53568] [Bug #8130]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40255 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-11 19:07:49 +00:00
nagachika
44212576f5 merge revision(s) 39905,39919,39925,39945: [Backport #8163]
* test/ruby/envutil.rb (assert_ruby_status): include stderr output.	  unlinked method entry. [Bug #8100] [ruby-core:53439]

	* proc.c (bm_free): need to clean up the mark flag of a free and


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40254 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-11 18:47:16 +00:00
nagachika
35cc23f493 merge revision(s) 39866,39887,39921,40161,40170: [Backport #8144] [Backport #8227]
* addr2line.c (rb_dump_backtrace_with_lines): output line at once.

	* addr2line.c (kprintf): added from FreeBSD libstand's printf.
	  this is consided as async signal safe function.

	* addr2line.c (rb_dump_backtrace_with_lines): use kfprintf.
	  [Bug #8144] [ruby-core:53632]

	* addr2line.c (putce): suppress unused return value warning.

	* addr2line.c: quad_t and u_quad_t is not available on Solaris.
	  __inline is not available with old compilers on Solaris.
	  [ruby-dev:47229] [Bug #8227]

	* addr2line.c: use more generic type:
	  * u_char -> unsigned char
	  * u_short -> unsigned short
	  * u_int -> unsigned int
	  * u_long -> unsigned long
	  * quad_t -> int64_t
	  * u_quad_t -> uint64_t

	* addr2line.c (imax): inline is defined by configure.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40253 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-04-11 17:33:25 +00:00
nagachika
047b553920 merge revision(s) 39742,39743: [Backport #8005]
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-11 17:19:28 +00:00
nagachika
a5d40b289f merge revision(s) 39544,39546: [Backport #7992]
* 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-11 17:00:49 +00:00
nagachika
a7256d7a00 merge revision(s) 39697,39701,39716,39740,39751: [Backport #8069]
* 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-11 16:47:45 +00:00
nagachika
8e4d69ade4 merge revision(s) 39810: [Backport #8145]
* 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-07 15:11:15 +00:00