merge revision(s) r45045,r45046,r45530: [Backport #9697]

* ext/socket/ipsocket.c (ip_s_getaddress): Don't access freed memory.

	* ext/socket: Wrap struct addrinfo by struct rb_addrinfo.

	* ext/socket/socket.c (sock_s_getnameinfo): Save errno for EAI_SYSTEM.
	  Reported by Saravana kumar.  [ruby-core:61820] [Bug #9697]
	  Fixed by Heesob Park.  [ruby-core:61868]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@46054 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2014-05-22 15:24:30 +00:00
parent a3d95003e1
commit e60ec9551c
7 changed files with 123 additions and 80 deletions

View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.1.2"
#define RUBY_RELEASE_DATE "2014-05-19"
#define RUBY_PATCHLEVEL 105
#define RUBY_RELEASE_DATE "2014-05-23"
#define RUBY_PATCHLEVEL 106
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 5
#define RUBY_RELEASE_DAY 19
#define RUBY_RELEASE_DAY 23
#include "ruby/version.h"