Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/shared/Utilities/Util.h
This commit is contained in:
commit
3b32053c59
10 files changed
+35
-38
No files matched your search
@@ -83,11 +83,8 @@ void WorldSocket::AsyncReadHeader()
|
||||
else
|
||||
{
|
||||
// _socket.is_open() till returns true even after calling close()
|
||||
try
|
||||
{
|
||||
_socket.close();
|
||||
}
|
||||
catch (std::exception const& /*ex*/) { }
|
||||
boost::system::error_code socketError;
|
||||
_socket.close(socketError);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -193,11 +190,8 @@ void WorldSocket::AsyncReadData(size_t dataSize)
|
||||
else
|
||||
{
|
||||
// _socket.is_open() till returns true even after calling close()
|
||||
try
|
||||
{
|
||||
_socket.close();
|
||||
}
|
||||
catch (std::exception const& /*ex*/) {}
|
||||
boost::system::error_code socketError;
|
||||
_socket.close(socketError);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user