diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-20 09:06:53 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-20 09:06:53 +0000 |
commit | 4d17c7336b76a30e85f30ee0107dd6998b50cc2f (patch) | |
tree | 821f6c686ba0392ba85e7d434ee63f6ef28f7c84 | |
parent | e2608406a55394e281edcf4f467b7a3372fb4244 (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_7@22461 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:06:40 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:41:08 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 187 #define RUBY_RELEASE_CODE 20090220 -#define RUBY_PATCHLEVEL 131 +#define RUBY_PATCHLEVEL 132 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |