aboutsummaryrefslogtreecommitdiff
path: root/modules/line_handler.py
diff options
context:
space:
mode:
authorGravatar jesopo2019-02-05 22:26:57 +0000
committerGravatar jesopo2019-02-05 22:26:57 +0000
commit5d51a283bb4c585f068a580eec96cf316e35f062 (patch)
treed39284164727ed280dbc377a554375c40cd40a0a /modules/line_handler.py
parentSTARTTLS was removed long ago (diff)
signature
Actually check that we don't have CAPs that we're waiting on a ACK/NAK for
before ending CAP negotiation (line_handler.py)
Diffstat (limited to 'modules/line_handler.py')
-rw-r--r--modules/line_handler.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/line_handler.py b/modules/line_handler.py
index 7a692bd1..4c112d21 100644
--- a/modules/line_handler.py
+++ b/modules/line_handler.py
@@ -320,7 +320,9 @@ class Module(ModuleManager.BaseModule):
if subcommand == "ack" or subcommand == "nak":
for capability in capabilities:
event["server"].requested_capabilities.remove(capability)
+
if (event["server"].cap_started and
+ not event["server"].requested_capabilities and
not event["server"].waiting_for_capabilities()):
event["server"].cap_started = False
event["server"].send_capability_end()