summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream/xmlstream.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-12-27 18:05:42 -0500
committerLance Stout <lancestout@gmail.com>2011-12-27 18:05:42 -0500
commit2f2ebb37e4d1bc8b25503063d327a7d02706b3ac (patch)
tree1b31cf621a7927c9aab3ac899e19583411818abd /sleekxmpp/xmlstream/xmlstream.py
parentf6e30edbc4a717b34bbf01d3d0a9fe884c6b37da (diff)
parent522f0dac167717603f2b52c0e0c10389d9e41768 (diff)
downloadslixmpp-2f2ebb37e4d1bc8b25503063d327a7d02706b3ac.tar.gz
slixmpp-2f2ebb37e4d1bc8b25503063d327a7d02706b3ac.tar.bz2
slixmpp-2f2ebb37e4d1bc8b25503063d327a7d02706b3ac.tar.xz
slixmpp-2f2ebb37e4d1bc8b25503063d327a7d02706b3ac.zip
Merge branch 'develop' into develop-1.1
Diffstat (limited to 'sleekxmpp/xmlstream/xmlstream.py')
-rw-r--r--sleekxmpp/xmlstream/xmlstream.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index 66dd657a..d5029928 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -1190,6 +1190,7 @@ class XMLStream(object):
shutdown = True
except SyntaxError as e:
log.error("Error reading from XML stream.")
+ shutdown = True
self.exception(e)
except Socket.error as serr:
self.event('socket_error', serr)