diff options
| author | Jose <jose@zeroc.com> | 2016-06-15 18:06:00 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-06-15 18:06:00 +0200 |
| commit | 99855eefd7419c24e9b204fb851ec95adc581b4e (patch) | |
| tree | 0d79a68449d770c3c550b43121c0d6d43f602d14 /cpp/src/Ice/Network.cpp | |
| parent | Allow java libraries to override pom scm data (diff) | |
| parent | Stack trace test expec files for Linux (diff) | |
| download | ice-99855eefd7419c24e9b204fb851ec95adc581b4e.tar.bz2 ice-99855eefd7419c24e9b204fb851ec95adc581b4e.tar.xz ice-99855eefd7419c24e9b204fb851ec95adc581b4e.zip | |
Merge branch '3.6-stretch' into 3.6
Diffstat (limited to 'cpp/src/Ice/Network.cpp')
| -rw-r--r-- | cpp/src/Ice/Network.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index d7c1c22ba92..7fa9614379c 100644 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -1238,7 +1238,17 @@ IceInternal::closeSocket(SOCKET fd) WSASetLastError(error); #else int error = errno; + +# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + // + // FreeBSD returns ECONNRESET if the underlying object was + // a stream socket that was shut down by the peer before all + // pending data was delivered. + // + if(close(fd) == SOCKET_ERROR && getSocketErrno() != ECONNRESET) +# else if(close(fd) == SOCKET_ERROR) +# endif { SocketException ex(__FILE__, __LINE__); ex.error = getSocketErrno(); |