Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp src/server/scripts/Northrend/zone_dalaran.cpp src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp
This commit is contained in:
commit
e68d3b0937
71 files changed
+1036
-499
No files matched your search
@@ -82,7 +82,12 @@ void WorldSocket::AsyncReadHeader()
|
||||
}
|
||||
else
|
||||
{
|
||||
_socket.close();
|
||||
// _socket.is_open() till returns true even after calling close()
|
||||
try
|
||||
{
|
||||
_socket.close();
|
||||
}
|
||||
catch (std::exception const& /*ex*/) { }
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -187,7 +192,12 @@ void WorldSocket::AsyncReadData(size_t dataSize)
|
||||
}
|
||||
else
|
||||
{
|
||||
_socket.close();
|
||||
// _socket.is_open() till returns true even after calling close()
|
||||
try
|
||||
{
|
||||
_socket.close();
|
||||
}
|
||||
catch (std::exception const& /*ex*/) {}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user