Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
  • Loading branch information
guruofquality committed Aug 14, 2018
2 parents f2e51b3 + 8c23b1c commit 6d8074e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions Changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Release 0.5.0 (pending)
Release 0.4.4 (pending)
==========================

- Report error for SoapyRPCSocket close() failure
- SoapyLogAcceptor fix shutdown when connection is lost
- SoapyRPCUnpacker fix select logic for small timeouts

Expand Down
1 change: 1 addition & 0 deletions common/SoapyRPCSocket.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ int SoapyRPCSocket::close(void)
if (this->null()) return 0;
int ret = ::closesocket(_sock);
_sock = INVALID_SOCKET;
if (ret != 0) this->reportError("closesocket()");
return ret;
}

Expand Down

0 comments on commit 6d8074e

Please # to comment.