diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-16 14:34:01 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-16 14:34:01 +0000 |
| commit | 351f54de4505dac2a5b4c54727dfa366962fc1cb (patch) | |
| tree | 3a7fd2869fd9f3d0fcc89ff7ee7d27ebdb179867 | |
| parent | 112b228273eb58912e5de30ba684a1ce912213a6 (diff) | |
| download | ruby-351f54de4505dac2a5b4c54727dfa366962fc1cb.tar.gz | |
* ext/socket/ancdata.c (bsock_sendmsg_internal) [OpenBSD]: don't remove
the last padding to prevent sendmsg failure in test_udp_server in
test/socket/test_socket.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22359 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/socket/ancdata.c | 2 |
2 files changed, 8 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Mon Feb 16 23:14:51 2009 Tanaka Akira <akr@fsij.org> + + * ext/socket/ancdata.c (bsock_sendmsg_internal) [OpenBSD]: don't remove + the last padding to prevent sendmsg failure in test_udp_server in + test/socket/test_socket.rb. + Mon Feb 16 21:59:32 2009 Alexander Zavorine <alexandre.zavorine@nokia.com> * symbian/setup: Update Symbian config to match recent changes in missing/alloca.c diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c index fdbaf62c51..b78af5460a 100644 --- a/ext/socket/ancdata.c +++ b/ext/socket/ancdata.c @@ -927,9 +927,11 @@ bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock) MEMCPY(CMSG_DATA(cmh), RSTRING_PTR(cdata), char, RSTRING_LEN(cdata)); last_pad = cspace - cmh->cmsg_len; } +#if !defined(__OpenBSD__) if (last_pad) { rb_str_set_len(controls_str, RSTRING_LEN(controls_str)-last_pad); } +#endif #else rb_raise(rb_eNotImpError, "control message for sendmsg is unimplemented"); #endif |