* range.c (rb_range_beg_len): should return Qfalse for non-range

  object.

* pack.c (EXTEND16): [ruby-dev:27383]

* eval.c (set_trace_func): add rb_secure(4) to prevent adding
  tracing function.

* lib/delegate.rb: document update from James Edward Gray II
  <[email protected]>.  [ruby-core:05942]

* process.c (proc_daemon): should restrict execution on levels
  higher than $SAFE=2.  suggested by URABE Shyouhei
  <[email protected]>.

* lib/forwardable.rb: replaced by new implementation from
  <[email protected]>.  [ruby-core:05899]

* file.c (path_check_0): disallow sticky world writable directory
  in PATH (and $LOAD_PATH).  [ruby-dev:27226]

* numeric.c (fix_idiv): 1.div(1.0) should return integer value.
  [ruby-dev:27235]

* lib/yaml.rb: require 'yaml/constants'.  [ruby-core:5776]

* lib/xmlrpc/client.rb (XMLRPC::Client::do_rpc): add charset
  information to content-type header.[ruby-core:5127]

* lib/xmlrpc/server.rb (CGIServer::serve): ditto.

* lib/xmlrpc/server.rb (ModRubyServer::serve): ditto.

* lib/xmlrpc/server.rb (WEBrickServlet::service): ditto.

* test/dbm/test_dbm.rb (TestDBM::test_s_open_error): remove
  test_s_open_error test to detect duplicate open.
  [ruby-dev:27202]

* eval.c (splat_value): use to_a to splat non Array object.

* object.c (nil_to_a): remove nil.to_a.  [experimental]


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

2 files changed, 4 insertions, 4 deletions

diff --git a/lib/xmlrpc/client.rb b/lib/xmlrpc/client.rb
index 074f5014cf..dadd3279f2 100644
--- a/lib/xmlrpc/client.rb
+++ b/lib/xmlrpc/client.rb
@@ -500,7 +500,7 @@ module XMLRPC
     def do_rpc(request, async=false)
       header = {  
        "User-Agent"     =>  USER_AGENT,
-       "Content-Type"   => "text/xml",
+       "Content-Type"   => "text/xml; charset=utf-8",
        "Content-Length" => request.size.to_s, 
        "Connection"     => (async ? "close" : "keep-alive")
       }
diff --git a/lib/xmlrpc/server.rb b/lib/xmlrpc/server.rb
index 43041f343f..59a5869408 100644
--- a/lib/xmlrpc/server.rb
+++ b/lib/xmlrpc/server.rb
@@ -456,7 +456,7 @@ class CGIServer < BasicServer
 
       http_error(400, "Bad Request")        if data.nil? or data.size != length
 
-      http_write(process(data), "Content-type" => "text/xml")
+      http_write(process(data), "Content-type" => "text/xml; charset=utf-8")
     }
   end
 
@@ -531,7 +531,7 @@ class ModRubyServer < BasicServer
 
       http_error(400, "Bad Request")        if data.nil? or data.size != length
 
-      http_write(process(data), 200, "Content-type" => "text/xml")
+      http_write(process(data), 200, "Content-type" => "text/xml; charset=utf-8")
     }
   end
 
@@ -764,7 +764,7 @@ class WEBrickServlet < BasicServer
 
     response.status = 200
     response['Content-Length'] = resp.size
-    response['Content-Type']   = "text/xml"
+    response['Content-Type']   = "text/xml; charset=utf-8"
     response.body = resp 
   end
 end