merge revision(s) 39208:

	* ext/json: merge JSON 1.7.7.
	  This includes security fix. [CVE-2013-0269]
	  https://github.com/flori/json/commit/d0a62f3ced7560daba2ad546d83f0479a5ae2cf2
	  https://groups.google.com/d/topic/rubyonrails-security/4_YvCpLzL58/discussion


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39215 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 39209:

	Get libc's path by ldd [Bug #7828] [ruby-core:52129]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39216 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 39210:

	Suppress warnings: setting Encoding.default_external

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39217 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Backport part of r39166 from trunk [ruby-trunk - Bug #7809]

* lib/rubygems/package.rb:  Include checksums.yaml.gz signatures for
  verification.
* test/rubygems/test_gem_package.rb:  Test for the above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39227 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* 2013-02-14

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39228 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Backport r39213 from trunk [ruby-trunk - Bug #7383]

* lib/rubygems.rb:  Return BINARY strings from Gem.gzip and Gem.gunzip.
  Fixes intermittent test failures.  RubyGems issue #450 by Jeremey
  Kemper.
* test/rubygems/test_gem.rb:  Test for the above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39229 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Backport r39168 Warning about TracePoint events to 2.0.0
  [ruby-core:52073] [Bug #7815]

* vm_trace.c: note about TracePoint events set


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 39232,39233,39238: [Backport #7831][Backport #7852]

	* lib/net/http:  Do not handle Content-Encoding when the user sets
	  Accept-Encoding.  This allows users to handle Content-Encoding for
	  themselves.  This restores backwards-compatibility with Ruby 1.x.

	* lib/net/http/generic_request.rb:  ditto.

	* lib/net/http/response.rb:  ditto

	* test/net/http/test_http.rb:  Test for the above.

	* test/net/http/test_http_request.rb:  ditto.

	* test/net/http/test_httpresponse.rb:  ditto.
	  [ruby-trunk - Bug #7831]

	* lib/net/http.rb:  Removed OpenSSL dependency from Net::HTTP.

	* test/net/http/test_http.rb:  Remove Zlib dependency from tests.

	* test/net/http/test_http_request.rb:  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39244 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* backport r39276 from trunk. [ruby-dev:46997] [Bug #7825]

* vm.c (rb_thread_mark): mark a working Proc of bmethod
  (a method defined by define_method) even if the method was removed.
  We could not trace working Proc object which represents the body
  of bmethod if the method was removed (alias/undef/overridden).
  Simply, it was mark miss.
  This patch by Kazuki Tsujimoto. [Bug #7825]

  NOTE: We can brush up this marking because we do not need to mark
  `me' on each living control frame. We need to mark `me's
  only if `me' was free'ed. This is future work after Ruby 2.0.0.

* test/ruby/test_method.rb: add a test.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39279 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* 2013-02-16

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39280 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* backport r39275 from trunk. [ruby-dev:46994] [Bug #7774]
* proc.c (rb_binding_new_with_cfp): create binding object even if
  the frame is IFUNC. But return a ruby-level binding to keep
  compatibility.
  This patch fix degradation introduced from r39067.
  [Bug #7774] [ruby-dev:46960]
* test/ruby/test_settracefunc.rb: add a test.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39305 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* 2013-02-19

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39306 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 39201,39202:

	* win32/Makefile.sub (config.status): site and vendor directories
	  should use sitearch, not arch.  [ruby-dev:46964] [Bug #7823]

	* configure.in (rubysitearchprefix): sitearchdir and vendorarchdir
	  should use sitearch, not arch.  [ruby-dev:46964] [Bug #7823]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39311 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* lib/rdoc.rb:  Update to release version of 4.0.0

* lib/rubygems.rb:  Update to release version of 2.0.0


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39318 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* backport r39307 from trunk.  [Bug #7880]

* lib/rubygems/installer.rb:  Fixed placement of executables with
  --user-install.  [ruby-trunk - Bug #7779]

* test/rubygems/test_gem_installer.rb:  Test for above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39319 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 39267,39273,39294,39298,39313:

	* configure.in: unexpand arch sitearch and exec_prefix values, so
	  directly specified bindir, libdir, rubyprefix, etc can be properly
	  substituted.  [ruby-core:52296] [Bug #7860]

	* configure.in (shvar_to_cpp): do not substitute exec_prefix itself
	  with RUBY_EXEC_PREFIX, which cause recursive definition.
	  [ruby-core:52296] [Bug #7860]

	* configure.in (unexpand_shvar): regularize a shell variable by
	  unexpanding shell variables in it.

	* configure.in (unexpand_shvar): regularize a shell variable by
	  unexpanding shell variables in it.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39320 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Merge revision 39292:

* compar.c (rb_invcmp): compare by inversed comarison, with preventing
  from infinite recursion.  [ruby-core:52305] [Bug #7870]

* string.c (rb_str_cmp_m), time.c (time_cmp): get rid of infinite
  recursion.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39325 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* 2013-02-20

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39326 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 39308:

	* vm_eval.c (vm_call0_body): check interrupts after method dispatch
	  from C methods. [Bug #7878]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39332 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* NEWS: Add that Fixnums and Bignums are frozen

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