aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_tls.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-12-24 23:19:48 +0000
committerMatthew Wild <mwild1@gmail.com>2008-12-24 23:19:48 +0000
commit385317309cf0ebbeddc6ebdfe7daa69a73e8f79c (patch)
tree64b10323c12d2a274f12b6901d22317fffc45fb1 /plugins/mod_tls.lua
parent483f3cd6d6eb2b8591f0cff404b78e6f88cf4987 (diff)
parent8661b3a502e85126500cb4a05d509ec85bc3c24d (diff)
downloadprosody-385317309cf0ebbeddc6ebdfe7daa69a73e8f79c.tar.gz
prosody-385317309cf0ebbeddc6ebdfe7daa69a73e8f79c.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...");