kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 26750:

Browse source 
* lib/resolv.rb: fix [ruby-core:28320] reported by Paul Clegg.
	  (Resolv::DNS::Requester#request): raise ResolvTimeout consistently
	  for timeout.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@27960 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2010-05-22 13:31:52 +00:00
parent a733f8f5ae
commit 8dbacbfefc
3 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sat May 22 22:31:36 2010 Tanaka Akira <akr@fsij.org>
* lib/resolv.rb: fix [ruby-core:28320] reported by Paul Clegg.
(Resolv::DNS::Requester#request): raise ResolvTimeout consistently
for timeout.
Sat May 22 22:14:11 2010 NARUSE, Yui <naruse@ruby-lang.org>
* ext/readline/readline.c (Init_readline): initialize

6
lib/resolv.rb
View file

@ -611,8 +611,12 @@ class Resolv
def request(sender, tout)
timelimit = Time.now + tout
sender.send
while (now = Time.now) < timelimit
while true
now = Time.now
timeout = timelimit - now
if timeout <= 0
raise ResolvTimeout
end
select_result = IO.select(@socks, nil, nil, timeout)
if !select_result
raise ResolvTimeout

2
version.h
View file

@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2010-05-22"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20100522
#define RUBY_PATCHLEVEL 264
#define RUBY_PATCHLEVEL 265
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8