aboutsummaryrefslogtreecommitdiffstats
path: root/net/server.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-11-16 00:29:15 +0000
committerMatthew Wild <mwild1@gmail.com>2008-11-16 00:29:15 +0000
commitd3497ccf48b98f6d41d56b35aac563cc4dcb76a5 (patch)
tree68c878cb4141ad4fdd0764d96b3e4c49ae3f941a /net/server.lua
parent17768803c9d98386e720f8521b5bd87504d9fa68 (diff)
downloadprosody-d3497ccf48b98f6d41d56b35aac563cc4dcb76a5.tar.gz
prosody-d3497ccf48b98f6d41d56b35aac563cc4dcb76a5.zip
Fix for putting TLS in stream:features for connections already using TLS. Thanks to albert for spotting.
Diffstat (limited to 'net/server.lua')
-rw-r--r--net/server.lua2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/server.lua b/net/server.lua
index 40cc6dc8..3bbe80b4 100644
--- a/net/server.lua
+++ b/net/server.lua
@@ -523,6 +523,8 @@ wraptlsclient = function( listener, socket, ip, serverport, clientport, mode, ss
return receive( socket, pattern, prefix )
end
+ handler.starttls = nil;
+
handler.handshake = coroutine_wrap( function( client )
local err
for i = 1, 10 do -- 10 handshake attemps