From 18b9ea805e7559396c35e5b7d36e57764b6d5e6b Mon Sep 17 00:00:00 2001 From: upstream svn Date: Tue, 5 Jan 2010 19:35:02 +0000 Subject: [PATCH] Upstream tarball 9939 --- .svn-revision | 2 +- src/EMSocket.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.svn-revision b/.svn-revision index 5fd03a8e..037be39d 100644 --- a/.svn-revision +++ b/.svn-revision @@ -1 +1 @@ -9938 +9939 diff --git a/src/EMSocket.cpp b/src/EMSocket.cpp index 32ed3753..f055d418 100644 --- a/src/EMSocket.cpp +++ b/src/EMSocket.cpp @@ -527,7 +527,7 @@ SocketSentBytes CEMSocket::Send(uint32 maxNumberOfBytesToSend, uint32 minFragSiz uint32 sentStandardPacketBytesThisCall = 0; uint32 sentControlPacketBytesThisCall = 0; - if (byConnected == ES_CONNECTED && IsEncryptionLayerReady() && !m_bBusy) { + if (byConnected == ES_CONNECTED && IsEncryptionLayerReady() && (!m_bBusy || onlyAllowedToSendControlPacket)) { //printf("* Internal attemptto send on %p\n", this); -- 2.11.4.GIT