mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/drb/drb.rb: removed unused argument. Patch by @vipulnsward
[fix GH-515] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49130 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
05c108cdba
commit
837d30371b
3 changed files with 12 additions and 4 deletions
|
@ -1,3 +1,8 @@
|
|||
Sun Jan 4 09:21:04 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
|
||||
|
||||
* lib/drb/drb.rb: removed unused argument. Patch by @vipulnsward
|
||||
[fix GH-515]
|
||||
|
||||
Sun Jan 4 09:18:31 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
|
||||
|
||||
* lib/tempfile.rb: provide default basename parameter.
|
||||
|
|
3
NEWS
3
NEWS
|
@ -24,6 +24,9 @@ with all sufficient information, see the ChangeLog file.
|
|||
* lib/webrick/utils.rb
|
||||
* removed unused argument. https://github.com/ruby/ruby/pull/356
|
||||
|
||||
* lib/drb/drb.rb
|
||||
* removed unused argument. https://github.com/ruby/ruby/pull/515
|
||||
|
||||
=== Built-in global variables compatibility issues
|
||||
|
||||
=== C API updates
|
||||
|
|
|
@ -745,7 +745,7 @@ module DRb
|
|||
end
|
||||
end
|
||||
if first && (config[:auto_load] != false)
|
||||
auto_load(uri, config)
|
||||
auto_load(uri)
|
||||
return open(uri, config, false)
|
||||
end
|
||||
raise DRbBadURI, 'can\'t parse uri:' + uri
|
||||
|
@ -769,7 +769,7 @@ module DRb
|
|||
end
|
||||
end
|
||||
if first && (config[:auto_load] != false)
|
||||
auto_load(uri, config)
|
||||
auto_load(uri)
|
||||
return open_server(uri, config, false)
|
||||
end
|
||||
raise DRbBadURI, 'can\'t parse uri:' + uri
|
||||
|
@ -792,14 +792,14 @@ module DRb
|
|||
end
|
||||
end
|
||||
if first && (config[:auto_load] != false)
|
||||
auto_load(uri, config)
|
||||
auto_load(uri)
|
||||
return uri_option(uri, config, false)
|
||||
end
|
||||
raise DRbBadURI, 'can\'t parse uri:' + uri
|
||||
end
|
||||
module_function :uri_option
|
||||
|
||||
def auto_load(uri, config) # :nodoc:
|
||||
def auto_load(uri) # :nodoc:
|
||||
if uri =~ /^drb([a-z0-9]+):/
|
||||
require("drb/#{$1}") rescue nil
|
||||
end
|
||||
|
|
Loading…
Add table
Reference in a new issue