aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_tls.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-12-25 01:37:13 +0000
committerMatthew Wild <mwild1@gmail.com>2008-12-25 01:37:13 +0000
commit449e72c7363f6bb316ba516e20a79d01f8b2a558 (patch)
tree4e99a91122be3df0e1d74e02791b9fd0fdc68087 /plugins/mod_tls.lua
parent1f5c712bcd35210ccc29e821ad367d38c8e53d1e (diff)
parent385317309cf0ebbeddc6ebdfe7daa69a73e8f79c (diff)
downloadprosody-449e72c7363f6bb316ba516e20a79d01f8b2a558.tar.gz
prosody-449e72c7363f6bb316ba516e20a79d01f8b2a558.zip
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'plugins/mod_tls.lua')
-rw-r--r--plugins/mod_tls.lua2
1 files changed, 0 insertions, 2 deletions
diff --git a/plugins/mod_tls.lua b/plugins/mod_tls.lua
index 771d251a..fc816ad1 100644
--- a/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@ -33,8 +33,6 @@ module:add_handler("c2s_unauthed", "starttls", xmlns_starttls,
function (session, stanza)
if session.conn.starttls then
session.send(st.stanza("proceed", { xmlns = xmlns_starttls }));
- -- FIXME: I'm commenting the below, not sure why it was necessary
- -- sessions[session.conn] = nil;
session:reset_stream();
session.conn.starttls();
session.log("info", "TLS negotiation started...");