summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-15 04:16:03 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-15 04:16:03 +0000
commit4aacaf216c64be1c45983aa992c8f4f9160ba6c7 (patch)
treed30e13dc577d21e919394c026f2a928d027d6b30 /version.h
parent43defa70006d957574578503365fef8d4d18c646 (diff)
merge revision(s) 49543: [Backport #10854]
* ext/socket/getaddrinfo.c (get_addr): reject too long hostname to get rid of GHOST vulnerability on very old platforms. * ext/socket/raddrinfo.c (make_hostent_internal): ditto, paranoic check for the canonnical name. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49605 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 94ef77bc34..04eee75321 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.2.0"
-#define RUBY_RELEASE_DATE "2015-02-14"
-#define RUBY_PATCHLEVEL 48
+#define RUBY_RELEASE_DATE "2015-02-15"
+#define RUBY_PATCHLEVEL 49
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 14
+#define RUBY_RELEASE_DAY 15
#include "ruby/version.h"