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

merges r31405 from trunk into ruby_1_9_2.

Browse source 
--
* ext/socket/init.c (rsock_connect): add to care EINTR. based
  on a patch from Eric Wong at [ruby-core:35621][Bug #4555]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31829 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2011-05-31 00:11:17 +00:00
parent 766c32adc3
commit d3818d6b55
3 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Mon May 2 00:36:12 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* ext/socket/init.c (rsock_connect): add to care EINTR. based
on a patch from Eric Wong at [ruby-core:35621][Bug #4555]
Sat Apr 30 03:25:53 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* test/io/wait/test_io_wait.rb: New. for testing ext/io/wait.

6
ext/socket/init.c
View file

@ -383,6 +383,12 @@ rsock_connect(int fd, const struct sockaddr *sockaddr, int len, int socks)
status = (int)BLOCKING_REGION(func, &arg);
if (status < 0) {
switch (errno) {
case EINTR:
#if defined(ERESTART)
case ERESTART:
#endif
continue;
case EAGAIN:
#ifdef EINPROGRESS
case EINPROGRESS:

6
version.h
View file

@ -1,13 +1,13 @@
#define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 246
#define RUBY_PATCHLEVEL 247
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2011
#define RUBY_RELEASE_MONTH 5
#define RUBY_RELEASE_DAY 30
#define RUBY_RELEASE_DATE "2011-05-30"
#define RUBY_RELEASE_DAY 31
#define RUBY_RELEASE_DATE "2011-05-31"
#include "ruby/version.h"