Skip to content

Commit

Permalink
fix jenni hanging when not using SASL or password
Browse files Browse the repository at this point in the history
If jenni isn't configured to use SASL, a CAP LS was still sent, but the
module is disabled so no CAP END is send after recieving CAP * LS from
the server, leading to a hang. This makes it so that if there's no SASL,
jenni doesn't even begin the CAP handshake.
  • Loading branch information
keeakita committed Feb 20, 2015
1 parent f747f73 commit 3402802
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion irc.py
Expand Up @@ -218,7 +218,8 @@ def handle_connect(self):
if self.verbose:
print >> sys.stderr, 'connected!'

self.write(('CAP', 'LS'))
if self.use_sasl:
self.write(('CAP', 'LS'))

if not self.use_sasl and self.password:
self.write(('PASS', self.password))
Expand Down

0 comments on commit 3402802

Please sign in to comment.