diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-01 15:13:01 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-01 15:13:01 +0000 |
| commit | bd00df2f1a96356bc669b39c797cacff65193acd (patch) | |
| tree | 74f7c3f156b1e3050cada7e5f37eb69c9d22f90a | |
| parent | 329ab042ee76bec0d2319eb177932fe13d20669b (diff) | |
* lib/resolv.rb (Requester#request): typo, regression introduced at
r49422 (patchlevel 618). reported and patched by Stefan Kolb
[ruby-core:69429] [Backport #11204]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@50723 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/resolv.rb | 2 | ||||
| -rw-r--r-- | version.h | 8 |
3 files changed, 11 insertions, 5 deletions
@@ -1,3 +1,9 @@ +Tue Jun 2 00:10:14 2015 NAKAMURA Usaku <usa@ruby-lang.org> + + * lib/resolv.rb (Requester#request): typo, regression introduced at + r49422 (patchlevel 618). reported and patched by Stefan Kolb + [ruby-core:69429] [Backport #11204] + Mon Apr 13 22:11:42 2015 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> * ext/openssl/lib/openssl/ssl.rb: stricter hostname verification diff --git a/lib/resolv.rb b/lib/resolv.rb index 1f38cd1070..5373f2e140 100644 --- a/lib/resolv.rb +++ b/lib/resolv.rb @@ -665,7 +665,7 @@ class Resolv begin sender.send rescue Errno::EHOSTUNREACH, # multi-homed IPv6 may generate this - Erron::ENETUNREACH + Errno::ENETUNREACH raise ResolvTimeout end while true @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2015-04-13" -#define RUBY_PATCHLEVEL 645 +#define RUBY_RELEASE_DATE "2015-06-02" +#define RUBY_PATCHLEVEL 646 #define RUBY_RELEASE_YEAR 2015 -#define RUBY_RELEASE_MONTH 4 -#define RUBY_RELEASE_DAY 13 +#define RUBY_RELEASE_MONTH 6 +#define RUBY_RELEASE_DAY 2 #include "ruby/version.h" |