diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-04-03 06:48:08 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-04-03 06:48:08 +0000 |
| commit | f7ba3c3de30d60327c7f862c2227693a642c66bf (patch) | |
| tree | 141c840271652df1b9fa8b4d6d767a062a81bc28 | |
| parent | d33cc535c3dba51c2275b50a7dcad3b0ca53cb50 (diff) | |
* ext/socket/socket.c (s_recv, s_recvfrom): some systems (such as
windows) doesn't set fromlen if the socket is connection-oriented.
reported by Bram Whillock in [ruby-core:10512] [ruby-Bugs#9061]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12137 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/socket/socket.c | 4 | ||||
| -rw-r--r-- | version.h | 8 |
3 files changed, 12 insertions, 6 deletions
@@ -1,3 +1,9 @@ +Tue Apr 3 15:45:41 2007 NAKAMURA Usaku <[email protected]> + + * ext/socket/socket.c (s_recv, s_recvfrom): some systems (such as + windows) doesn't set fromlen if the socket is connection-oriented. + reported by Bram Whillock in [ruby-core:10512] [ruby-Bugs#9061] + Sat Mar 24 23:40:29 2007 Nobuyoshi Nakada <[email protected]> * node.h (struct rb_thread.locals): explicit as struct. diff --git a/ext/socket/socket.c b/ext/socket/socket.c index b3966872ea..4c23a1c178 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -625,7 +625,7 @@ s_recvfrom(sock, argc, argv, from) rb_raise(rb_eTypeError, "sockaddr size differs - should not happen"); } #endif - if (alen) /* OSX doesn't return a 'from' result from recvfrom for connection-oriented sockets */ + if (alen && alen != sizeof(buf)) /* OSX doesn't return a 'from' result from recvfrom for connection-oriented sockets */ return rb_assoc_new(str, ipaddr((struct sockaddr*)buf)); else return rb_assoc_new(str, Qnil); @@ -691,7 +691,7 @@ s_recvfrom_nonblock(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from) return str; case RECV_IP: - if (alen) /* connection-oriented socket may not return a from result */ + if (alen && alen != sizeof(buf)) /* connection-oriented socket may not return a from result */ addr = ipaddr((struct sockaddr*)buf); break; @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2007-03-24" +#define RUBY_RELEASE_DATE "2007-04-03" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20070324 +#define RUBY_RELEASE_CODE 20070403 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2007 -#define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 24 +#define RUBY_RELEASE_MONTH 4 +#define RUBY_RELEASE_DAY 3 RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_release_date[]; |