diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-07-10 04:06:05 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-07-10 04:06:05 +0000 |
commit | f813b7dc1a34800bb675ffd83d6d05013b10c5d8 (patch) | |
tree | 494889c5acb2ec85399e081a68d83b478d9c396e /missing | |
parent | aa1fdb90530fb9d440ab2eae182bf085f1ca2570 (diff) |
merges r28561 from trunk into ruby_1_9_2.
--
* missing/close.c: ignore ECONNRESET.
FreeBSD wrongly sets ECONNRESET on close(2) and
it causes false-negative exceptions. [ruby-dev:41778]
* configure.in: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'missing')
-rw-r--r-- | missing/close.c | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/missing/close.c b/missing/close.c new file mode 100644 index 0000000000..7e743eb204 --- /dev/null +++ b/missing/close.c @@ -0,0 +1,55 @@ +/* Ignore ECONNRESET of FreeBSD */ +#include <errno.h> +#include <unistd.h> +#include <sys/types.h> +#include <sys/socket.h> + +int +ruby_getpeername(int s, struct sockaddr * name, + socklen_t * namelen) +{ + errno = 0; + s = getpeername(s, name, namelen); + if (errno == ECONNRESET) { + errno = 0; + s = 0; + } + return s; +} + +int +ruby_getsockname(int s, struct sockaddr * name, + socklen_t * namelen) +{ + errno = 0; + s = getsockname(s, name, namelen); + if (errno == ECONNRESET) { + errno = 0; + s = 0; + } + return s; +} + +int +ruby_shutdown(int s, int how) +{ + errno = 0; + s = shutdown(s, how); + if (errno == ECONNRESET) { + errno = 0; + s = 0; + } + return s; +} + +int +ruby_close(int s) +{ + errno = 0; + s = close(s); + if (errno == ECONNRESET) { + errno = 0; + s = 0; + } + return s; +} |