summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-01-07 12:05:16 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-01-07 12:05:16 +0000
commite804822e7af4602562b16143a4f2d5663cd59013 (patch)
treeb0f953779efd0915cdd4f7dabef093799aa6af26 /version.h
parent6f9b40ea53d8f3fb2a5b1c7ac55c207d42c77ef4 (diff)
merge revision(s) 62671: [Backport #14571]
resolv.rb: close socket * lib/resolv.rb (UnconnectedUDP#lazy_initialize): store new sockets before binding, so the sockets get closed when the requester is closing. * lib/resolv.rb (ConnectedUDP#lazy_initialize): ditto. * lib/resolv.rb (UnconnectedUDP#close): synchronize to get rid of race condition. * lib/resolv.rb (ConnectedUDP#close): ditto. [ruby-core:85901] [Bug #14571] From: quixoten (Devin Christensen) <quixoten@gmail.com> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@66748 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r--version.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/version.h b/version.h
index 2092efcc69..0b6e38b248 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.5.4"
-#define RUBY_RELEASE_DATE "2019-01-02"
-#define RUBY_PATCHLEVEL 124
+#define RUBY_RELEASE_DATE "2019-01-07"
+#define RUBY_PATCHLEVEL 125
#define RUBY_RELEASE_YEAR 2019
#define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 2
+#define RUBY_RELEASE_DAY 7
#include "ruby/version.h"