ruby.git/lib, branch v2_1_4

merge revision(s) r48161:

2014-10-27T11:23:17+00:00

	* lib/rexml/entity.rb: keep the entity size within the limitation.
	  reported by Willis Vandevanter  and
	  patched by nahi.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@48163 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

merge revision(s) r47900: [Backport #10035]

2014-10-15T15:31:03+00:00

	* lib/find.rb (Find.find): Call to_path for arguments to obtain
	  strings.
	  [ruby-core:63713] [Bug #10035] Reported by Herwin.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47958 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

merge revision(s) r46783: [Backport #6716]

2014-10-15T14:51:58+00:00

	* lib/fileutils.rb: handle ENOENT error with symlink targeted to
	  non-exists file. [ruby-dev:45933] [Bug #6716]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47953 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

merge revision(s) r44459,r44470: [Backport #8315]

2014-09-15T02:08:59+00:00

	* lib/mkmf.rb (configuration): Make CXXFLAGS customizable.
	  Patch by Kohei Suzuki (eagletmt). [Fixes GH-492]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47592 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

merge revision(s) r47457: [Backport #8315]

2014-09-14T16:13:47+00:00

	* lib/mkmf.rb (MakeMakefile#pkg_config): append --cflags to also
	  $CXXFLAGS, as they are often used by C++ compiler.
	  [ruby-core:54532] [Bug #8315]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

merge revision(s) r46391,r46395: [Backport #9766]

2014-09-14T15:25:34+00:00

	* lib/csv.rb (CSV#<<): honor explicity given encoding.  based on
	  the patch by DAISUKE TANIWAKI  at
	  [ruby-core:62113].  [Bug #9766]

	* lib/csv.rb (CSV#<<): honor explicitly given encoding.  based on


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47586 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

Backport r47425

2014-09-06T00:04:18+00:00

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47426 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

merge revision(s) r45349,r45837,r45838: [Backport #9521] [Backport #9682]

2014-08-20T16:41:49+00:00

	* lib/time.rb: [DOC] Fix timezone in example of Time.parse [Bug #9521]
	  Based on patch by @stomar

	* lib/time.rb (Time.parse): [DOC] Fix an example in the documentation.
	  Reported by Marcus Stollsteimer.
	  [ruby-core:60778] [Bug #9521] and [ruby-core:61718] [Bug #9682]

	* lib/time.rb (Time.parse): [DOC] Fix an example in the documentation
	  to use EST.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47228 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

merge revision(s) r46241: [Backport #9875]

2014-08-11T14:55:58+00:00

	* lib/erb.rb (result): [DOC] no longer accepts a Proc, as
	  Kernel.eval does not.  [fix GH-619]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47141 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

merge revision(s) r45953,r45961: [Backport #9767]

2014-07-23T14:53:36+00:00

	* lib/test/unit/parallel.rb: fix test-all parallel failure if a test
	  is skipped after raise.
	  DL::TestFunc#test_sinf is skipped after raise on mingw ruby.
	  But it causes Mashal.load failure due to undefined class/module
	  DL::DLError when doing test-all parallel and test-all doesn't
	  complete. We create new MiniTest::Skip object to avoid Mashal.load
	  failure.
	  [ruby-core:62133] [Bug #9767]

	* test/testunit/test_parallel.rb (TestParallel): add a test.

	* test/testunit/tests_for_parallel/ptest_forth.rb: ditto.
	  But it causes Marshal.load failure due to undefined class/module
	  complete. We create new MiniTest::Skip object to avoid Marshal.load


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46916 b2dd03c8-39d4-4d8f-98ff-823fe69b080e