* lib/xmlrpc/client.rb: use "" instead of "." if prefix argument is

  nil in proxy methods. nil is default value.

* test/xmlrpc/test_webrick_server.rb, test/xmlrpc/webrick_testing.rb:
  use threads instead of forking. this should fix issue #1208
  (http://rubyforge.org/tracker/?func=detail&atid=1698&aid=1208&group_id=426).
  removed testing of SSL enabled servlet as this hangs.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7630 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/xmlrpc/client.rb b/lib/xmlrpc/client.rb
index 18cf4b0cf3..226739e4b8 100644
--- a/lib/xmlrpc/client.rb
+++ b/lib/xmlrpc/client.rb
@@ -457,19 +457,19 @@ module XMLRPC
 
     # Proxy generating methods ------------------------------------------
     
-    def proxy(prefix, *args)
+    def proxy(prefix=nil, *args)
       Proxy.new(self, prefix, args, :call)
     end
 
-    def proxy2(prefix, *args)
+    def proxy2(prefix=nil, *args)
       Proxy.new(self, prefix, args, :call2)
     end
 
-    def proxy_async(prefix, *args)
+    def proxy_async(prefix=nil, *args)
       Proxy.new(self, prefix, args, :call_async)
     end
 
-    def proxy2_async(prefix, *args)
+    def proxy2_async(prefix=nil, *args)
       Proxy.new(self, prefix, args, :call2_async)
     end
 
@@ -586,7 +586,7 @@ module XMLRPC
 
       def initialize(server, prefix, args=[], meth=:call, delim=".")
 	@server = server
-	@prefix = prefix + delim
+	@prefix = prefix ? prefix + delim : ""
 	@args   = args 
         @meth   = meth
       end