diff options
| author | Tilman Keskinoz <arved@FreeBSD.org> | 2011-07-31 15:43:29 +0000 |
|---|---|---|
| committer | Tilman Keskinoz <arved@FreeBSD.org> | 2011-07-31 15:43:29 +0000 |
| commit | 728b894f6d10bbaf508842b375a355462aa2384b (patch) | |
| tree | 6392986de89bb0bdb7f44a2a82eafb4e4e432b3f /devel/ice/files | |
| parent | 011dce24ce7dd5253f7e97aaa947acb21339dcd5 (diff) | |
| download | ports-728b894f6d10bbaf508842b375a355462aa2384b.tar.gz ports-728b894f6d10bbaf508842b375a355462aa2384b.zip | |
Fix a compatibility issue with FreeBSD's implementation of close(2) which
results in Ice reporting errno ECONNRESET (connection reset by peer).
PR: 159031
Submitted by: Michael Gmelin <freebsd@grem.de>
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=278636
Diffstat (limited to 'devel/ice/files')
| -rw-r--r-- | devel/ice/files/patch-cpp-src-Ice-Network.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/devel/ice/files/patch-cpp-src-Ice-Network.cpp b/devel/ice/files/patch-cpp-src-Ice-Network.cpp new file mode 100644 index 000000000000..c3a95e6dd154 --- /dev/null +++ b/devel/ice/files/patch-cpp-src-Ice-Network.cpp @@ -0,0 +1,15 @@ +--- cpp.orig/src/Ice/Network.cpp 2011-06-15 21:43:58.000000000 +0200 ++++ cpp/src/Ice/Network.cpp 2011-07-15 23:40:26.000000000 +0200 +@@ -715,7 +715,11 @@ + WSASetLastError(error); + #else + int error = errno; +- if(close(fd) == SOCKET_ERROR) ++ if(close(fd) == SOCKET_ERROR ++# if defined(__FreeBSD__) ++ && getSocketErrno() != ECONNRESET ++# endif ++ ) + { + SocketException ex(__FILE__, __LINE__); + ex.error = getSocketErrno(); |