merges r20854 from trunk into ruby_1_9_1.

* lib/xmlrpc/server.rb:  Restricting method inspection to show only
  non-inherited public methods.  [ruby-core:20603]

* lib/xmlrpc/server.rb:  Fixing method inspection so it doesn't
  trigger XMLRPC::FaultException when used.  [ruby-core:20604]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20879 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 1 deletions

diff --git a/lib/xmlrpc/server.rb b/lib/xmlrpc/server.rb
index ca8d3b0a5..0ee88c8c8 100644
--- a/lib/xmlrpc/server.rb
+++ b/lib/xmlrpc/server.rb
@@ -267,7 +267,9 @@ class BasicServer
         if obj.kind_of? Proc
           methods << name
         else
-          obj.methods.each {|meth| methods << name + meth}
+          obj.class.public_instance_methods(false).each do |meth|
+            methods << "#{name}#{meth}"
+          end
         end
       end
       methods