Merge branch 'develop' into develop-1.1

2011-12-27 18:05:42 -05:00
parent f6e30edbc4 522f0dac16
commit 2f2ebb37e4
6 changed files with 289 additions and 39 deletions
--- 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)