nobu	2015-06-17 09:50:15 +0900 (Wed, 17 Jun 2015)

  New Revision: 50928

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50928

  Log:
    servlet.rb: requires json
    
    * lib/rdoc/servlet.rb (documentation_search, root_search):
      requires json for JSON.dump and fix sporadic failures due to
      the loading order.

  Modified files:
    trunk/ChangeLog
    trunk/lib/rdoc/servlet.rb
    trunk/test/rdoc/test_rdoc_servlet.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 50927)
+++ ChangeLog	(revision 50928)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Jun 17 09:50:12 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/rdoc/servlet.rb (documentation_search, root_search):
+	  requires json for JSON.dump and fix sporadic failures due to
+	  the loading order.
+
 Tue Jun 16 19:19:53 2015  Tanaka Akira  <akr@f...>
 
 	* ext/rbconfig/sizeof/extconf.rb: Check several types defined in C99
Index: lib/rdoc/servlet.rb
===================================================================
--- lib/rdoc/servlet.rb	(revision 50927)
+++ lib/rdoc/servlet.rb	(revision 50928)
@@ -1,5 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/lib/rdoc/servlet.rb#L1
 require 'rdoc'
 require 'time'
+require 'json'
 require 'webrick'
 
 ##
Index: test/rdoc/test_rdoc_servlet.rb
===================================================================
--- test/rdoc/test_rdoc_servlet.rb	(revision 50927)
+++ test/rdoc/test_rdoc_servlet.rb	(revision 50928)
@@ -185,7 +185,7 @@ class TestRDocServlet < RDoc::TestCase https://github.com/ruby/ruby/blob/trunk/test/rdoc/test_rdoc_servlet.rb#L185
 
     @s.do_GET @req, @res
 
-    assert_equal 'application/javascript', @res.content_type
+    assert_equal 'application/javascript', @res.content_type, @res.body
   end
 
   def test_documentation_page_class

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/