* lib: Convert tabs to spaces for ruby files per

	  http://redmine.ruby-lang.org/projects/ruby/wiki/DeveloperHowto#coding-style
	  Patch by Steve Klabnik [Ruby 1.9 - Bug #4730]
	  Patch by Jason Dew [Ruby 1.9 - Feature #4718]


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

8 files changed, 351 insertions, 351 deletions

diff --git a/lib/drb/acl.rb b/lib/drb/acl.rb
index 36ed2cbacd..cf51687987 100644
--- a/lib/drb/acl.rb
+++ b/lib/drb/acl.rb
@@ -51,15 +51,15 @@ class ACL
 
     def initialize(str)
       if str == '*' or str == 'all'
-	@pat = [:all]
+        @pat = [:all]
       elsif str.include?('*')
         @pat = [:name, dot_pat(str)]
       else
-	begin
-	  @pat = [:ip, IPAddr.new(str)]
-	rescue ArgumentError
-	  @pat = [:name, dot_pat(str)]
-	end
+        begin
+          @pat = [:ip, IPAddr.new(str)]
+        rescue ArgumentError
+          @pat = [:name, dot_pat(str)]
+        end
       end
     end
 
@@ -70,7 +70,7 @@ class ACL
 
     def dot_pat_str(str)
       list = str.split('.').collect { |s|
-	(s == '*') ? '.+' : s
+        (s == '*') ? '.+' : s
       }
       list.join("\\.")
     end
@@ -93,19 +93,19 @@ class ACL
     def match(addr)
       case @pat[0]
       when :all
-	true
+        true
       when :ip
-	begin
-	  ipaddr = IPAddr.new(addr[3])
-	  ipaddr = ipaddr.ipv4_mapped if @pat[1].ipv6? && ipaddr.ipv4?
-	rescue ArgumentError
-	  return false
-	end
-	(@pat[1].include?(ipaddr)) ? true : false
+        begin
+          ipaddr = IPAddr.new(addr[3])
+          ipaddr = ipaddr.ipv4_mapped if @pat[1].ipv6? && ipaddr.ipv4?
+        rescue ArgumentError
+          return false
+        end
+        (@pat[1].include?(ipaddr)) ? true : false
       when :name
-	(@pat[1] =~ addr[2]) ? true : false
+        (@pat[1] =~ addr[2]) ? true : false
       else
-	false
+        false
       end
     end
   end
@@ -130,7 +130,7 @@ class ACL
 
     def match(addr)
       @list.each do |e|
-	return true if e.match(addr)
+        return true if e.match(addr)
       end
       false
     end
@@ -219,11 +219,11 @@ class ACL
       permission, domain = list.slice(i,2)
       case permission.downcase
       when 'allow'
-	@allow.add(domain)
+        @allow.add(domain)
       when 'deny'
-	@deny.add(domain)
+        @deny.add(domain)
       else
-	raise "Invalid ACL entry #{list.to_s}"
+        raise "Invalid ACL entry #{list.to_s}"
       end
       i += 2
     end
@@ -234,17 +234,17 @@ end
 if __FILE__ == $0
   # example
   list = %w(deny all
-	    allow 192.168.1.1
+      allow 192.168.1.1
             allow ::ffff:192.168.1.2
             allow 192.168.1.3
-            )
+           )
 
-  addr = ["AF_INET", 10, "lc630", "192.168.1.3"]
+           addr = ["AF_INET", 10, "lc630", "192.168.1.3"]
 
-  acl = ACL.new
-  p acl.allow_addr?(addr)
+           acl = ACL.new
+           p acl.allow_addr?(addr)
 
-  acl = ACL.new(list, ACL::DENY_ALLOW)
-  p acl.allow_addr?(addr)
+           acl = ACL.new(list, ACL::DENY_ALLOW)
+           p acl.allow_addr?(addr)
 end
 
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index cacca145e9..c93762ca74 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -466,11 +466,11 @@ module DRb
     def initialize(err, buf)
       case err.to_s
       when /uninitialized constant (\S+)/
-	@name = $1
+        @name = $1
       when /undefined class\/module (\S+)/
-	@name = $1
+        @name = $1
       else
-	@name = nil
+        @name = nil
       end
       @buf = buf
     end
@@ -486,9 +486,9 @@ module DRb
 
     def self._load(s) # :nodoc:
       begin
-	Marshal::load(s)
+        Marshal::load(s)
       rescue NameError, ArgumentError
-	DRbUnknown.new($!, s)
+        DRbUnknown.new($!, s)
       end
     end
 
@@ -514,16 +514,16 @@ module DRb
   class DRbArray
     def initialize(ary)
       @ary = ary.collect { |obj|
-	if obj.kind_of? DRbUndumped
-	  DRbObject.new(obj)
-	else
-	  begin
-	    Marshal.dump(obj)
-	    obj
-	  rescue
-	    DRbObject.new(obj)
-	  end
-	end
+        if obj.kind_of? DRbUndumped
+          DRbObject.new(obj)
+        else
+          begin
+            Marshal.dump(obj)
+            obj
+          rescue
+            DRbObject.new(obj)
+          end
+        end
       }
     end
 
@@ -554,16 +554,16 @@ module DRb
     def dump(obj, error=false)  # :nodoc:
       obj = make_proxy(obj, error) if obj.kind_of? DRbUndumped
       begin
-	str = Marshal::dump(obj)
+        str = Marshal::dump(obj)
       rescue
-	str = Marshal::dump(make_proxy(obj, error))
+        str = Marshal::dump(make_proxy(obj, error))
       end
       [str.size].pack('N') + str
     end
 
     def load(soc)  # :nodoc:
       begin
-        sz = soc.read(4)	# sizeof (N)
+        sz = soc.read(4)  # sizeof (N)
       rescue
         raise(DRbConnError, $!.message, $!.backtrace)
       end
@@ -600,7 +600,7 @@ module DRb
       ary.push(dump(msg_id.id2name))
       ary.push(dump(arg.length))
       arg.each do |e|
-	ary.push(dump(e))
+        ary.push(dump(e))
       end
       ary.push(dump(b))
       stream.write(ary.join(''))
@@ -616,7 +616,7 @@ module DRb
       raise(DRbConnError, "too many arguments") if @argc_limit < argc
       argv = Array.new(argc, nil)
       argc.times do |n|
-	argv[n] = load(stream)
+        argv[n] = load(stream)
       end
       block = load(stream)
       return ro, msg, argv, block
@@ -727,18 +727,18 @@ module DRb
     # URI, but an error occurs in opening it, a DRbConnError is raised.
     def open(uri, config, first=true)
       @protocol.each do |prot|
-	begin
-	  return prot.open(uri, config)
-	rescue DRbBadScheme
-	rescue DRbConnError
-	  raise($!)
-	rescue
-	  raise(DRbConnError, "#{uri} - #{$!.inspect}")
-	end
+        begin
+          return prot.open(uri, config)
+        rescue DRbBadScheme
+        rescue DRbConnError
+          raise($!)
+        rescue
+          raise(DRbConnError, "#{uri} - #{$!.inspect}")
+        end
       end
       if first && (config[:auto_load] != false)
-	auto_load(uri, config)
-	return open(uri, config, false)
+        auto_load(uri, config)
+        return open(uri, config, false)
       end
       raise DRbBadURI, 'can\'t parse uri:' + uri
     end
@@ -755,14 +755,14 @@ module DRb
     # error is passed on to the caller.
     def open_server(uri, config, first=true)
       @protocol.each do |prot|
-	begin
-	  return prot.open_server(uri, config)
-	rescue DRbBadScheme
-	end
+        begin
+          return prot.open_server(uri, config)
+        rescue DRbBadScheme
+        end
       end
       if first && (config[:auto_load] != false)
-	auto_load(uri, config)
-	return open_server(uri, config, false)
+        auto_load(uri, config)
+        return open_server(uri, config, false)
       end
       raise DRbBadURI, 'can\'t parse uri:' + uri
     end
@@ -776,15 +776,15 @@ module DRb
     # URI, then a DRbBadURI error is raised.
     def uri_option(uri, config, first=true)
       @protocol.each do |prot|
-	begin
-	  uri, opt = prot.uri_option(uri, config)
-	  # opt = nil if opt == ''
-	  return uri, opt
-	rescue DRbBadScheme
-	end
+        begin
+          uri, opt = prot.uri_option(uri, config)
+          # opt = nil if opt == ''
+          return uri, opt
+        rescue DRbBadScheme
+        end
       end
       if first && (config[:auto_load] != false)
-	auto_load(uri, config)
+        auto_load(uri, config)
         return uri_option(uri, config, false)
       end
       raise DRbBadURI, 'can\'t parse uri:' + uri
@@ -793,7 +793,7 @@ module DRb
 
     def auto_load(uri, config)  # :nodoc:
       if uri =~ /^drb([a-z0-9]+):/
-	require("drb/#{$1}") rescue nil
+        require("drb/#{$1}") rescue nil
       end
     end
     module_function :auto_load
@@ -806,13 +806,13 @@ module DRb
     private
     def self.parse_uri(uri)
       if uri =~ /^druby:\/\/(.*?):(\d+)(\?(.*))?$/
-	host = $1
-	port = $2.to_i
-	option = $4
-	[host, port, option]
+        host = $1
+        port = $2.to_i
+        option = $4
+        [host, port, option]
       else
-	raise(DRbBadScheme, uri) unless uri =~ /^druby:/
-	raise(DRbBadURI, 'can\'t parse uri:' + uri)
+        raise(DRbBadScheme, uri) unless uri =~ /^druby:/
+          raise(DRbBadURI, 'can\'t parse uri:' + uri)
       end
     end
 
@@ -858,7 +858,7 @@ module DRb
         host = getservername
         soc = open_server_inaddr_any(host, port)
       else
-	soc = TCPServer.open(host, port)
+        soc = TCPServer.open(host, port)
       end
       port = soc.addr[1] if port == 0
       config[:tcp_port] = port
@@ -928,8 +928,8 @@ module DRb
     # client-server session.
     def close
       if @socket
-	@socket.close
-	@socket = nil
+        @socket.close
+        @socket = nil
       end
     end
 
@@ -938,9 +938,9 @@ module DRb
     # the server's side of this client-server session.
     def accept
       while true
-	s = @socket.accept
-	break if (@acl ? @acl.allow_socket?(s) : true)
-	s.close
+        s = @socket.accept
+        break if (@acl ? @acl.allow_socket?(s) : true)
+        s.close
       end
       if @config[:tcp_original_host].to_s.size == 0
         uri = "druby://#{s.addr[3]}:#{@config[:tcp_port]}"
@@ -954,8 +954,8 @@ module DRb
     def alive?
       return false unless @socket
       if IO.select([@socket], nil, nil, 0)
-	close
-	return false
+        close
+        return false
       end
       true
     end
@@ -1004,7 +1004,7 @@ module DRb
       uri, ref = Marshal.load(s)
 
       if DRb.here?(uri)
-	obj = DRb.to_obj(ref)
+        obj = DRb.to_obj(ref)
         if ((! obj.tainted?) && Thread.current[:drb_untaint])
           Thread.current[:drb_untaint].push(obj)
         end
@@ -1042,12 +1042,12 @@ module DRb
       @uri = nil
       @ref = nil
       if obj.nil?
-	return if uri.nil?
-	@uri, option = DRbProtocol.uri_option(uri, DRb.config)
-	@ref = DRbURIOption.new(option) unless option.nil?
+        return if uri.nil?
+        @uri, option = DRbProtocol.uri_option(uri, DRb.config)
+        @ref = DRbURIOption.new(option) unless option.nil?
       else
-	@uri = uri ? uri : (DRb.uri rescue nil)
-	@ref = obj ? DRb.to_id(obj) : nil
+        @uri = uri ? uri : (DRb.uri rescue nil)
+        @ref = obj ? DRb.to_id(obj) : nil
       end
     end
 
@@ -1078,9 +1078,9 @@ module DRb
     # Routes method calls to the referenced object.
     def method_missing(msg_id, *a, &b)
       if DRb.here?(@uri)
-	obj = DRb.to_obj(@ref)
-	DRb.current_server.check_insecure_method(obj, msg_id)
-	return obj.__send__(msg_id, *a, &b)
+        obj = DRb.to_obj(@ref)
+        DRb.current_server.check_insecure_method(obj, msg_id)
+        return obj.__send__(msg_id, *a, &b)
       end
 
       succ, result = self.class.with_friend(@uri) do
@@ -1095,7 +1095,7 @@ module DRb
         raise result
       else
         bt = self.class.prepare_backtrace(@uri, result)
-	result.set_backtrace(bt + caller)
+        result.set_backtrace(bt + caller)
         raise result
       end
     end
@@ -1117,7 +1117,7 @@ module DRb
       result.backtrace.each do |x|
         break if /`__send__'$/ =~ x
         if /^\(druby:\/\// =~ x
-          bt.push(x)
+               bt.push(x)
         else
           bt.push(prefix + x)
         end
@@ -1153,36 +1153,36 @@ module DRb
 
     def self.open(remote_uri)  # :nodoc:
       begin
-	conn = nil
-
-	@mutex.synchronize do
-	  #FIXME
-	  new_pool = []
-	  @pool.each do |c|
-	    if conn.nil? and c.uri == remote_uri
-	      conn = c if c.alive?
-	    else
-	      new_pool.push c
-	    end
-	  end
-	  @pool = new_pool
-	end
-
-	conn = self.new(remote_uri) unless conn
-	succ, result = yield(conn)
-	return succ, result
+        conn = nil
+
+        @mutex.synchronize do
+          #FIXME
+          new_pool = []
+          @pool.each do |c|
+            if conn.nil? and c.uri == remote_uri
+              conn = c if c.alive?
+            else
+              new_pool.push c
+            end
+          end
+          @pool = new_pool
+        end
+
+        conn = self.new(remote_uri) unless conn
+        succ, result = yield(conn)
+        return succ, result
 
       ensure
-	if conn
-	  if succ
-	    @mutex.synchronize do
-	      @pool.unshift(conn)
-	      @pool.pop.close while @pool.size > POOL_SIZE
-	    end
-	  else
-	    conn.close
-	  end
-	end
+        if conn
+          if succ
+            @mutex.synchronize do
+              @pool.unshift(conn)
+              @pool.pop.close while @pool.size > POOL_SIZE
+            end
+          else
+            conn.close
+          end
+        end
       end
     end
 
@@ -1274,11 +1274,11 @@ module DRb
 
     def self.make_config(hash={})  # :nodoc:
       default_config = {
-	:idconv => @@idconv,
-	:verbose => @@verbose,
-	:tcp_acl => @@acl,
-	:load_limit => @@load_limit,
-	:argc_limit => @@argc_limit,
+        :idconv => @@idconv,
+        :verbose => @@verbose,
+        :tcp_acl => @@acl,
+        :load_limit => @@load_limit,
+        :argc_limit => @@argc_limit,
         :safe_level => @@safe_level
       }
       default_config.update(hash)
@@ -1329,12 +1329,12 @@ module DRb
     # The server will immediately start running in its own thread.
     def initialize(uri=nil, front=nil, config_or_acl=nil)
       if Hash === config_or_acl
-	config = config_or_acl.dup
+        config = config_or_acl.dup
       else
-	acl = config_or_acl || @@acl
-	config = {
-	  :tcp_acl => acl
-	}
+        acl = config_or_acl || @@acl
+        config = {
+          :tcp_acl => acl
+        }
       end
 
       @config = self.class.make_config(config)
@@ -1414,28 +1414,28 @@ module DRb
     private
     def kill_sub_thread
       Thread.new do
-	grp = ThreadGroup.new
-	grp.add(Thread.current)
-	list = @grp.list
-	while list.size > 0
-	  list.each do |th|
-	    th.kill if th.alive?
-	  end
-	  list = @grp.list
-	end
+        grp = ThreadGroup.new
+        grp.add(Thread.current)
+        list = @grp.list
+        while list.size > 0
+          list.each do |th|
+            th.kill if th.alive?
+          end
+          list = @grp.list
+        end
       end
     end
 
     def run
       Thread.start do
-	begin
-	  while true
-	    main_loop
-	  end
-	ensure
-	  @protocol.close if @protocol
-	  kill_sub_thread
-	end
+        begin
+          while true
+            main_loop
+          end
+        ensure
+          @protocol.close if @protocol
+          kill_sub_thread
+        end
       end
     end
 
@@ -1473,10 +1473,10 @@ module DRb
       raise(SecurityError, "insecure method `#{msg_id}'") if insecure_method?(msg_id)
 
       if obj.private_methods.include?(msg_id)
-	desc = any_to_s(obj)
+        desc = any_to_s(obj)
         raise NoMethodError, "private method `#{msg_id}' called for #{desc}"
       elsif obj.protected_methods.include?(msg_id)
-	desc = any_to_s(obj)
+        desc = any_to_s(obj)
         raise NoMethodError, "protected method `#{msg_id}' called for #{desc}"
       else
         true
@@ -1486,15 +1486,15 @@ module DRb
 
     class InvokeMethod  # :nodoc:
       def initialize(drb_server, client)
-	@drb_server = drb_server
+        @drb_server = drb_server
         @safe_level = drb_server.safe_level
-	@client = client
+        @client = client
       end
 
       def perform
-	@result = nil
-	@succ = false
-	setup_message
+        @result = nil
+        @succ = false
+        setup_message
 
         if $SAFE < @safe_level
           info = Thread.current['DRb']
@@ -1518,19 +1518,19 @@ module DRb
             @result = perform_without_block
           end
         end
-	@succ = true
-	if @msg_id == :to_ary && @result.class == Array
-	  @result = DRbArray.new(@result)
-	end
-	return @succ, @result
+        @succ = true
+        if @msg_id == :to_ary && @result.class == Array
+          @result = DRbArray.new(@result)
+        end
+        return @succ, @result
       rescue StandardError, ScriptError, Interrupt
-	@result = $!
-	return @succ, @result
+        @result = $!
+        return @succ, @result
       end
 
       private
       def init_with_client
-	obj, msg, argv, block = @client.recv_request
+        obj, msg, argv, block = @client.recv_request
         @obj = obj
         @msg_id = msg.intern
         @argv = argv
@@ -1542,21 +1542,21 @@ module DRb
       end
 
       def setup_message
-	init_with_client
-	check_insecure_method
+        init_with_client
+        check_insecure_method
       end
 
       def perform_without_block
-	if Proc === @obj && @msg_id == :__drb_yield
+        if Proc === @obj && @msg_id == :__drb_yield
           if @argv.size == 1
-	    ary = @argv
-	  else
-	    ary = [@argv]
-	  end
-	  ary.collect(&@obj)[0]
-	else
-	  @obj.__send__(@msg_id, *@argv)
-	end
+            ary = @argv
+          else
+            ary = [@argv]
+          end
+          ary.collect(&@obj)[0]
+        else
+          @obj.__send__(@msg_id, *@argv)
+        end
       end
 
     end
@@ -1582,29 +1582,29 @@ module DRb
     # or a local method call fails.
     def main_loop
       Thread.start(@protocol.accept) do |client|
-	@grp.add Thread.current
-	Thread.current['DRb'] = { 'client' => client ,
-	                          'server' => self }
-	loop do
-	  begin
-	    succ = false
-	    invoke_method = InvokeMethod.new(self, client)
-	    succ, result = invoke_method.perform
-	    if !succ && verbose
-	      p result
-	      result.backtrace.each do |x|
-		puts x
-	      end
-	    end
-	    client.send_reply(succ, result) rescue nil
-	  ensure
+        @grp.add Thread.current
+        Thread.current['DRb'] = { 'client' => client ,
+          'server' => self }
+        loop do
+          begin
+            succ = false
+            invoke_method = InvokeMethod.new(self, client)
+            succ, result = invoke_method.perform
+            if !succ && verbose
+              p result
+              result.backtrace.each do |x|
+                puts x
+              end
+            end
+            client.send_reply(succ, result) rescue nil
+          ensure
             client.close unless succ
             if Thread.current['DRb']['stop_service']
               Thread.new { stop_service }
             end
             break unless succ
-	  end
-	end
+          end
+        end
       end
     end
   end
diff --git a/lib/drb/extserv.rb b/lib/drb/extserv.rb
index 5996626492..4ef3253b77 100644
--- a/lib/drb/extserv.rb
+++ b/lib/drb/extserv.rb
@@ -1,6 +1,6 @@
 =begin
  external service
- 	Copyright (c) 2000,2002 Masatoshi SEKI
+   Copyright (c) 2000,2002 Masatoshi SEKI
 =end
 
 require 'drb/drb'
diff --git a/lib/drb/extservm.rb b/lib/drb/extservm.rb
index 5937cb0c50..71a5cf7a56 100644
--- a/lib/drb/extservm.rb
+++ b/lib/drb/extservm.rb
@@ -1,6 +1,6 @@
 =begin
  external service manager
- 	Copyright (c) 2000 Masatoshi SEKI
+   Copyright (c) 2000 Masatoshi SEKI
 =end
 
 require 'drb/drb'
@@ -54,17 +54,17 @@ module DRb
 
     def unregist(name)
       synchronize do
-	@servers.delete(name)
+        @servers.delete(name)
       end
     end
 
     private
     def invoke_thread
       Thread.new do
-	while true
-	  name = @queue.pop
-	  invoke_service_command(name, @@command[name])
-	end
+        while true
+          name = @queue.pop
+          invoke_service_command(name, @@command[name])
+        end
       end
     end
 
@@ -75,8 +75,8 @@ module DRb
     def invoke_service_command(name, command)
       raise "invalid command. name: #{name}" unless command
       synchronize do
-	return if @servers.include?(name)
-	@servers[name] = false
+        return if @servers.include?(name)
+        @servers[name] = false
       end
       uri = @uri || DRb.uri
       Process.detach spawn("#{command} #{uri} #{name}")
diff --git a/lib/drb/invokemethod.rb b/lib/drb/invokemethod.rb
index 5a231ed67b..353dbd00d8 100644
--- a/lib/drb/invokemethod.rb
+++ b/lib/drb/invokemethod.rb
@@ -4,9 +4,9 @@ module DRb
   class DRbServer
     module InvokeMethod18Mixin
       def block_yield(x)
-	if x.size == 1 && x[0].class == Array
-	  x[0] = DRbArray.new(x[0])
-	end
+        if x.size == 1 && x[0].class == Array
+          x[0] = DRbArray.new(x[0])
+        end
         @block.call(*x)
       end
 
diff --git a/lib/drb/ssl.rb b/lib/drb/ssl.rb
index 2abed5dce7..e15b5915c9 100644
--- a/lib/drb/ssl.rb
+++ b/lib/drb/ssl.rb
@@ -10,43 +10,43 @@ module DRb
     class SSLConfig
 
       DEFAULT = {
-	:SSLCertificate       => nil,
-	:SSLPrivateKey        => nil,
-	:SSLClientCA          => nil,
-	:SSLCACertificatePath => nil,
-	:SSLCACertificateFile => nil,
-	:SSLVerifyMode        => ::OpenSSL::SSL::VERIFY_NONE,
-	:SSLVerifyDepth       => nil,
-	:SSLVerifyCallback    => nil,   # custom verification
+        :SSLCertificate       => nil,
+        :SSLPrivateKey        => nil,
+        :SSLClientCA          => nil,
+        :SSLCACertificatePath => nil,
+        :SSLCACertificateFile => nil,
+        :SSLVerifyMode        => ::OpenSSL::SSL::VERIFY_NONE,
+        :SSLVerifyDepth       => nil,
+        :SSLVerifyCallback    => nil,   # custom verification
         :SSLCertificateStore  => nil,
-	# Must specify if you use auto generated certificate.
-	:SSLCertName          => nil,   # e.g. [["CN","fqdn.example.com"]]
-	:SSLCertComment       => "Generated by Ruby/OpenSSL"
+        # Must specify if you use auto generated certificate.
+        :SSLCertName          => nil,   # e.g. [["CN","fqdn.example.com"]]
+        :SSLCertComment       => "Generated by Ruby/OpenSSL"
       }
 
       def initialize(config)
-	@config  = config
+        @config  = config
         @cert    = config[:SSLCertificate]
         @pkey    = config[:SSLPrivateKey]
         @ssl_ctx = nil
       end
 
       def [](key);
-	@config[key] || DEFAULT[key]
+        @config[key] || DEFAULT[key]
       end
 
       def connect(tcp)
-	ssl = ::OpenSSL::SSL::SSLSocket.new(tcp, @ssl_ctx)
-	ssl.sync = true
-	ssl.connect
-	ssl
+        ssl = ::OpenSSL::SSL::SSLSocket.new(tcp, @ssl_ctx)
+        ssl.sync = true
+        ssl.connect
+        ssl
       end
 
       def accept(tcp)
-	ssl = OpenSSL::SSL::SSLSocket.new(tcp, @ssl_ctx)
-	ssl.sync = true
-	ssl.accept
-	ssl
+        ssl = OpenSSL::SSL::SSLSocket.new(tcp, @ssl_ctx)
+        ssl.sync = true
+        ssl.accept
+        ssl
       end
 
       def setup_certificate
@@ -54,56 +54,56 @@ module DRb
           return
         end
 
-	rsa = OpenSSL::PKey::RSA.new(512){|p, n|
-	  next unless self[:verbose]
-	  case p
-	  when 0; $stderr.putc "."  # BN_generate_prime
-	  when 1; $stderr.putc "+"  # BN_generate_prime
-	  when 2; $stderr.putc "*"  # searching good prime,
-	                            # n = #of try,
-                          	    # but also data from BN_generate_prime
-	  when 3; $stderr.putc "\n" # found good prime, n==0 - p, n==1 - q,
-                         	    # but also data from BN_generate_prime
-	  else;   $stderr.putc "*"  # BN_generate_prime
-	  end
-	}
-
-	cert = OpenSSL::X509::Certificate.new
-	cert.version = 3
-	cert.serial = 0
-	name = OpenSSL::X509::Name.new(self[:SSLCertName])
-	cert.subject = name
-	cert.issuer = name
-	cert.not_before = Time.now
-	cert.not_after = Time.now + (365*24*60*60)
-	cert.public_key = rsa.public_key
-
-	ef = OpenSSL::X509::ExtensionFactory.new(nil,cert)
-	cert.extensions = [
-	  ef.create_extension("basicConstraints","CA:FALSE"),
-	  ef.create_extension("subjectKeyIdentifier", "hash") ]
-	ef.issuer_certificate = cert
-	cert.add_extension(ef.create_extension("authorityKeyIdentifier",
-					       "keyid:always,issuer:always"))
-	if comment = self[:SSLCertComment]
-	  cert.add_extension(ef.create_extension("nsComment", comment))
-	end
-	cert.sign(rsa, OpenSSL::Digest::SHA1.new)
-
-	@cert = cert
-        @pkey = rsa
+        rsa = OpenSSL::PKey::RSA.new(512){|p, n|
+          next unless self[:verbose]
+          case p
+          when 0; $stderr.putc "."  # BN_generate_prime
+          when 1; $stderr.putc "+"  # BN_generate_prime
+          when 2; $stderr.putc "*"  # searching good prime,
+            # n = #of try,
+            # but also data from BN_generate_prime
+          when 3; $stderr.putc "\n" # found good prime, n==0 - p, n==1 - q,
+            # but also data from BN_generate_prime
+          else;   $stderr.putc "*"  # BN_generate_prime
+          end
+        }
+
+        cert = OpenSSL::X509::Certificate.new
+        cert.version = 3
+        cert.serial = 0
+        name = OpenSSL::X509::Name.new(self[:SSLCertName])
+        cert.subject = name
+        cert.issuer = name
+        cert.not_before = Time.now
+        cert.not_after = Time.now + (365*24*60*60)
+        cert.public_key = rsa.public_key
+
+        ef = OpenSSL::X509::ExtensionFactory.new(nil,cert)
+        cert.extensions = [
+          ef.create_extension("basicConstraints","CA:FALSE"),
+          ef.create_extension("subjectKeyIdentifier", "hash") ]
+          ef.issuer_certificate = cert
+          cert.add_extension(ef.create_extension("authorityKeyIdentifier",
+                                                 "keyid:always,issuer:always"))
+          if comment = self[:SSLCertComment]
+            cert.add_extension(ef.create_extension("nsComment", comment))
+          end
+          cert.sign(rsa, OpenSSL::Digest::SHA1.new)
+
+          @cert = cert
+          @pkey = rsa
       end
 
       def setup_ssl_context
         ctx = ::OpenSSL::SSL::SSLContext.new
         ctx.cert            = @cert
         ctx.key             = @pkey
-	ctx.client_ca       = self[:SSLClientCA]
-	ctx.ca_path         = self[:SSLCACertificatePath]
-	ctx.ca_file         = self[:SSLCACertificateFile]
-	ctx.verify_mode     = self[:SSLVerifyMode]
-	ctx.verify_depth    = self[:SSLVerifyDepth]
-	ctx.verify_callback = self[:SSLVerifyCallback]
+        ctx.client_ca       = self[:SSLClientCA]
+        ctx.ca_path         = self[:SSLCACertificatePath]
+        ctx.ca_file         = self[:SSLCACertificateFile]
+        ctx.verify_mode     = self[:SSLVerifyMode]
+        ctx.verify_depth    = self[:SSLVerifyDepth]
+        ctx.verify_callback = self[:SSLVerifyCallback]
         ctx.cert_store      = self[:SSLCertificateStore]
         @ssl_ctx = ctx
       end
@@ -111,13 +111,13 @@ module DRb
 
     def self.parse_uri(uri)
       if uri =~ /^drbssl:\/\/(.*?):(\d+)(\?(.*))?$/
-	host = $1
-	port = $2.to_i
-	option = $4
-	[host, port, option]
+        host = $1
+        port = $2.to_i
+        option = $4
+        [host, port, option]
       else
-	raise(DRbBadScheme, uri) unless uri =~ /^drbssl:/
-	raise(DRbBadURI, 'can\'t parse uri:' + uri)
+        raise(DRbBadScheme, uri) unless uri =~ /^drbssl:/
+          raise(DRbBadURI, 'can\'t parse uri:' + uri)
       end
     end
 
@@ -139,7 +139,7 @@ module DRb
         host = getservername
         soc = open_server_inaddr_any(host, port)
       else
-	soc = TCPServer.open(host, port)
+        soc = TCPServer.open(host, port)
       end
       port = soc.addr[1] if port == 0
       @uri = "drbssl://#{host}:#{port}"
@@ -164,24 +164,24 @@ module DRb
 
     def close
       if @ssl
-	@ssl.close
-	@ssl = nil
+        @ssl.close
+        @ssl = nil
       end
       super
     end
 
     def accept
       begin
-      while true
-	soc = @socket.accept
-	break if (@acl ? @acl.allow_socket?(soc) : true)
-	soc.close
-      end
-      ssl = @config.accept(soc)
-      self.class.new(uri, ssl, @config, true)
+        while true
+          soc = @socket.accept
+          break if (@acl ? @acl.allow_socket?(soc) : true)
+          soc.close
+        end
+        ssl = @config.accept(soc)
+        self.class.new(uri, ssl, @config, true)
       rescue OpenSSL::SSL::SSLError
-	warn("#{__FILE__}:#{__LINE__}: warning: #{$!.message} (#{$!.class})") if @config[:verbose]
-	retry
+        warn("#{__FILE__}:#{__LINE__}: warning: #{$!.message} (#{$!.class})") if @config[:verbose]
+        retry
       end
     end
   end
diff --git a/lib/drb/timeridconv.rb b/lib/drb/timeridconv.rb
index 7a4a097ba8..b460e2c987 100644
--- a/lib/drb/timeridconv.rb
+++ b/lib/drb/timeridconv.rb
@@ -9,65 +9,65 @@ module DRb
       class InvalidIndexError < RuntimeError; end
 
       def initialize(timeout=600)
-	super()
-	@sentinel = Object.new
-	@gc = {}
-	@curr = {}
-	@renew = {}
-	@timeout = timeout
-	@keeper = keeper
+        super()
+        @sentinel = Object.new
+        @gc = {}
+        @curr = {}
+        @renew = {}
+        @timeout = timeout
+        @keeper = keeper
       end
 
       def add(obj)
-	synchronize do
-	  key = obj.__id__
-	  @curr[key] = obj
-	  return key
-	end
+        synchronize do
+          key = obj.__id__
+          @curr[key] = obj
+          return key
+        end
       end
 
       def fetch(key, dv=@sentinel)
-	synchronize do
-	  obj = peek(key)
-	  if obj == @sentinel
-	    return dv unless dv == @sentinel
-	    raise InvalidIndexError
-	  end
-	  @renew[key] = obj # KeepIt
-	  return obj
-	end
+        synchronize do
+          obj = peek(key)
+          if obj == @sentinel
+            return dv unless dv == @sentinel
+            raise InvalidIndexError
+          end
+          @renew[key] = obj # KeepIt
+          return obj
+        end
       end
 
       def include?(key)
-	synchronize do
-	  obj = peek(key)
-	  return false if obj == @sentinel
-	  true
-	end
+        synchronize do
+          obj = peek(key)
+          return false if obj == @sentinel
+          true
+        end
       end
 
       def peek(key)
-	synchronize do
-	  return @curr.fetch(key, @renew.fetch(key, @gc.fetch(key, @sentinel)))
-	end
+        synchronize do
+          return @curr.fetch(key, @renew.fetch(key, @gc.fetch(key, @sentinel)))
+        end
       end
 
       private
       def alternate
-	synchronize do
-	  @gc = @curr       # GCed
-	  @curr = @renew
-	  @renew = {}
-	end
+        synchronize do
+          @gc = @curr       # GCed
+          @curr = @renew
+          @renew = {}
+        end
       end
 
       def keeper
-	Thread.new do
-	  loop do
-	    alternate
-	    sleep(@timeout)
-	  end
-	end
+        Thread.new do
+          loop do
+            alternate
+            sleep(@timeout)
+          end
+        end
       end
     end
 
diff --git a/lib/drb/unix.rb b/lib/drb/unix.rb
index a377dd995e..10465987f2 100644
--- a/lib/drb/unix.rb
+++ b/lib/drb/unix.rb
@@ -9,12 +9,12 @@ module DRb
   class DRbUNIXSocket < DRbTCPSocket
     def self.parse_uri(uri)
       if /^drbunix:(.*?)(\?(.*))?$/ =~ uri
-	filename = $1
-	option = $3
-	[filename, option]
+        filename = $1
+        option = $3
+        [filename, option]
       else
-	raise(DRbBadScheme, uri) unless uri =~ /^drbunix:/
-	raise(DRbBadURI, 'can\'t parse uri:' + uri)
+        raise(DRbBadScheme, uri) unless uri =~ /^drbunix:/
+          raise(DRbBadURI, 'can\'t parse uri:' + uri)
       end
     end
 
@@ -28,11 +28,11 @@ module DRb
     def self.open_server(uri, config)
       filename, = parse_uri(uri)
       if filename.size == 0
-	soc = temp_server
+        soc = temp_server
         filename = soc.path
-	uri = 'drbunix:' + soc.path
+        uri = 'drbunix:' + soc.path
       else
-	soc = UNIXServer.open(filename)
+        soc = UNIXServer.open(filename)
       end
       owner = config[:UNIXFileOwner]
       group = config[:UNIXFileGroup]
@@ -67,18 +67,18 @@ module DRb
       tmpdir = Dir::tmpdir
       n = 0
       while true
-	begin
-	  tmpname = sprintf('%s/druby%d.%d', tmpdir, $$, n)
-	  lock = tmpname + '.lock'
-	  unless File.exist?(tmpname) or File.exist?(lock)
-	    Dir.mkdir(lock)
-	    break
-	  end
-	rescue
-	  raise "cannot generate tempfile `%s'" % tmpname if n >= Max_try
-	  #sleep(1)
-	end
-	n += 1
+        begin
+          tmpname = sprintf('%s/druby%d.%d', tmpdir, $$, n)
+          lock = tmpname + '.lock'
+          unless File.exist?(tmpname) or File.exist?(lock)
+            Dir.mkdir(lock)
+            break
+          end
+        rescue
+          raise "cannot generate tempfile `%s'" % tmpname if n >= Max_try
+          #sleep(1)
+        end
+        n += 1
       end
       soc = UNIXServer.new(tmpname)
       Dir.rmdir(lock)