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 | 7f3c528333839131c5820a24f8fbf3fdf09c9eb1 (patch) | |
| tree | fa4a98e5bc7f69e5ca673ea241fbf59b1f1bd61e /ext/socket/socket.c | |
| parent | fbef2d92e5f21c84c873cd88e0812a085ef67f0d (diff) | |
| download | ruby-7f3c528333839131c5820a24f8fbf3fdf09c9eb1.tar.gz ruby-7f3c528333839131c5820a24f8fbf3fdf09c9eb1.tar.xz ruby-7f3c528333839131c5820a24f8fbf3fdf09c9eb1.zip | |
Work around OSX strangneness with recvfrom on connection-oriented sockets
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6506 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/socket.c')
| -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 88c642369..2cf100cac 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -460,7 +460,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)); + if (alen) /* 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); + // return rb_assoc_new(str, ipaddr((struct sockaddr*)buf)); #ifdef HAVE_SYS_UN_H case RECV_UNIX: return rb_assoc_new(str, unixaddr((struct sockaddr_un*)buf)); |