fix for ejabberd queue: clients disconnects when sent many stanzas

2 files changed, 15 insertions, 12 deletions

diff --git a/README.md b/README.md
index d4691c8..82a4c4e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
 xmpppy
 ======
 
-Just another fork of xmpppy library.
+Just another fork of xmpppy library. Provides full compability with standart xmpppy but also have a lot of security fixes.
\ No newline at end of file
diff --git a/xmpp/transports.py b/xmpp/transports.py
index 71e1fb3..210fb36 100644
--- a/xmpp/transports.py
+++ b/xmpp/transports.py
@@ -206,7 +206,7 @@ class TCPsocket(PlugIn):
 			raise IOError("Disconnected!")
 		return data
 
-	def send(self, data):
+	def send(self, data, timeout=0.002):
 		"""
 		Writes raw outgoing data. Blocks until done.
 		If supplied data is unicode string, encodes it to utf-8 before send.
@@ -215,17 +215,20 @@ class TCPsocket(PlugIn):
 			data = data.encode("utf-8")
 		elif not isinstance(data, str):
 			data = ustr(data).encode("utf-8")
-		try:
-			self._send(data)
-		except Exception:
-			self.DEBUG("Socket error while sending data.", "error")
-			self._owner.disconnected()
+		while not select((), [self._sock], (), timeout)[1]:
+			pass
 		else:
-			if not data.strip():
-				data = repr(data)
-			self.DEBUG(data, "sent")
-			if hasattr(self._owner, "Dispatcher"):
-				self._owner.Dispatcher.Event("", DATA_SENT, data)
+			try:
+				self._send(data)
+			except Exception:
+				self.DEBUG("Socket error while sending data.", "error")
+				self._owner.disconnected()
+			else:
+				if not data.strip():
+					data = repr(data)
+				self.DEBUG(data, "sent")
+				if hasattr(self._owner, "Dispatcher"):
+					self._owner.Dispatcher.Event("", DATA_SENT, data)
 
 	def pending_data(self, timeout=0):
 		"""