diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-20 09:06:15 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-20 09:06:15 +0000 |
commit | c1009be7581b7753800206ada40b5e340118c391 (patch) | |
tree | 1c18100ddecf3f99afc131fa88957003db206dd5 | |
parent | dd97bd1dddda726a156c1e4f11002bfc5771ac05 (diff) |
merge revision(s) 20855:
Merged 20854 from trunk.
* 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_8_6@22459 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | lib/xmlrpc/server.rb | 4 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 14 insertions, 2 deletions
@@ -1,3 +1,13 @@ +Fri Feb 20 18:05:27 2009 James Edward Gray II <jeg2@ruby-lang.org> + + Merged 20854 from trunk. + + * 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] + Fri Feb 20 01:40:18 2009 Yukihiro Matsumoto <matz@ruby-lang.org> * lib/sync.rb (Sync_m#sync_try_lock): wrong variable name fixed. 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 @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-02-20" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20090220 -#define RUBY_PATCHLEVEL 344 +#define RUBY_PATCHLEVEL 345 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |