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
This commit is contained in:
shyouhei 2009-02-20 09:06:53 +00:00
parent e2608406a5
commit 4d17c7336b
3 changed files with 14 additions and 2 deletions

View file

@ -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> 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. * lib/sync.rb (Sync_m#sync_try_lock): wrong variable name fixed.

View file

@ -267,7 +267,9 @@ class BasicServer
if obj.kind_of? Proc if obj.kind_of? Proc
methods << name methods << name
else else
obj.methods.each {|meth| methods << name + meth} obj.class.public_instance_methods(false).each do |meth|
methods << "#{name}#{meth}"
end
end end
end end
methods methods

View file

@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2009-02-20" #define RUBY_RELEASE_DATE "2009-02-20"
#define RUBY_VERSION_CODE 187 #define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20090220 #define RUBY_RELEASE_CODE 20090220
#define RUBY_PATCHLEVEL 131 #define RUBY_PATCHLEVEL 132
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_MINOR 8