diff options
| author | dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-06-23 13:23:55 +0000 |
|---|---|---|
| committer | dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-06-23 13:23:55 +0000 |
| commit | 465cb23d82bc4fce0c7d2099b0423259b1d47be9 (patch) | |
| tree | c85727ed175382e959ddf319171b0c77695b6fcb /ext/socket | |
| parent | 38347d38f8a4bdedd2bbe2b2657c3d330f7d1ff5 (diff) | |
| download | ruby-465cb23d82bc4fce0c7d2099b0423259b1d47be9.tar.gz ruby-465cb23d82bc4fce0c7d2099b0423259b1d47be9.tar.xz ruby-465cb23d82bc4fce0c7d2099b0423259b1d47be9.zip | |
Work around OSX strangneness with recvfrom on connection-oriented sockets
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6506 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket')
| -rw-r--r-- | ext/socket/socket.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 264b3fd73..42c4938c6 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -492,7 +492,11 @@ s_recvfrom(sock, argc, argv, from) rb_raise(rb_eTypeError, "sockaddr size differs - should not happen"); } #endif - return rb_assoc_new(str, ipaddr((struct sockaddr*)buf, fptr->mode & FMODE_NOREVLOOKUP)); + if (alen) /* OSX doesn't return a from result for connection-oriented sockets */ + return rb_assoc_new(str, ipaddr((struct sockaddr*)buf, fptr->mode & FMODE_NOREVLOOKUP)); + else + return rb_assoc_new(str, Qnil); + #ifdef HAVE_SYS_UN_H case RECV_UNIX: return rb_assoc_new(str, unixaddr((struct sockaddr_un*)buf)); |