diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-19 11:37:33 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-19 11:37:33 +0000 |
commit | bd938eccaf3aa8848faf9eebd6d7d15c24614561 (patch) | |
tree | f0b127295c838518312a6996d6ef9515697fa57a | |
parent | b261f5d831a50db25664ff4bdc0df7664b6885b3 (diff) |
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20879 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | lib/xmlrpc/server.rb | 4 |
2 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,11 @@ +Thu Dec 18 08:15:04 2008 James Edward Gray II <jeg2@ruby-lang.org> + + * 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] + Wed Dec 17 19:39:44 2008 Tanaka Akira <akr@fsij.org> * ext/socket/socket.c (unix_recv_io): relax msg_controllen error diff --git a/lib/xmlrpc/server.rb b/lib/xmlrpc/server.rb index ca8d3b0a5b..0ee88c8c8f 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 |