shyouhei	2009-02-20 18:06:53 +0900 (Fri, 20 Feb 2009)

  New Revision: 22461

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22461

  Log:
    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]

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/lib/xmlrpc/server.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 22460)
+++ ruby_1_8_7/ChangeLog	(revision 22461)
@@ -1,3 +1,13 @@
+Fri Feb 20 18:06:40 2009  James Edward Gray II  <jeg2@r...>
+
+	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@r...>
 
 	* lib/sync.rb (Sync_m#sync_try_lock): wrong variable name fixed.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 22460)
+++ ruby_1_8_7/version.h	(revision 22461)
@@ -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
Index: ruby_1_8_7/lib/xmlrpc/server.rb
===================================================================
--- ruby_1_8_7/lib/xmlrpc/server.rb	(revision 22460)
+++ ruby_1_8_7/lib/xmlrpc/server.rb	(revision 22461)
@@ -267,7 +267,9 @@
         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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/