jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix sending data after </stream>

Browse Source 
Clearing the session_started_event before sending </stream> will
pause the send loop so that we don't continue sending data after
the </stream>.
This commit is contained in:
Lance Stout 2012-03-28 23:53:55 -07:00
parent dda2473d35
commit 912463ed6a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sleekxmpp/xmlstream/xmlstream.py
View File

@ -628,17 +628,20 @@ class XMLStream(object):
elif self.disconnect_wait: elif self.disconnect_wait:
self.send_queue.join() self.send_queue.join()
# Clearing this event will pause the send loop.
self.session_started_event.clear()
# Send the end of stream marker. # Send the end of stream marker.
if send_close: if send_close:
self.send_raw(self.stream_footer, now=True) self.send_raw(self.stream_footer, now=True)
self.session_started_event.clear()
# Wait for confirmation that the stream was # Wait for confirmation that the stream was
# closed in the other direction. If we didn't # closed in the other direction. If we didn't
# send a stream footer we don't need to wait # send a stream footer we don't need to wait
# since the server won't know to respond. # since the server won't know to respond.
self.auto_reconnect = reconnect self.auto_reconnect = reconnect
if send_close: if send_close:
log.debug('Waiting for %s from server', self.stream_footer) log.info('Waiting for %s from server', self.stream_footer)
self.stream_end_event.wait(4) self.stream_end_event.wait(4)
else: else:
self.stream_end_event.set() self.stream_end_event.set()