Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Scripting/ScriptMgr.h
This commit is contained in:
Vincent-Michael committed 2014-08-27 23:06:40 +02:00
commit c0c708cf02
5 files changed
+139 -4

No files matched your search

@@ -31,12 +31,12 @@ using boost::asio::ip::tcp;
void RASession::Start()
{
boost::asio::socket_base::bytes_readable command(true);
_socket.io_control(command);
std::size_t bytes_readable = command.get();
// wait 1 second for active connections to send negotiation request
for (int counter = 0; counter < 10 && _socket.available() == 0; counter++)
std::this_thread::sleep_for(std::chrono::milliseconds(100));
// Check if there are bytes available, if they are, then the client is requesting the negotiation
if (bytes_readable > 0)
if (_socket.available() > 0)
{
// Handle subnegotiation
boost::array<char, 1024> buf;