aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-05-24 03:33:14 +0100
committerMatthew Wild <mwild1@gmail.com>2012-05-24 03:33:14 +0100
commit81a34bee5e7bbf54c85c0167a61656123414eaa2 (patch)
tree9b0b45fa9e9f82df9d17dd404da4e95ede99b988 /net
parent81cbf8c7d43374558c12664da8cf4207abdb0c6b (diff)
downloadprosody-81a34bee5e7bbf54c85c0167a61656123414eaa2.tar.gz
prosody-81a34bee5e7bbf54c85c0167a61656123414eaa2.zip
net.server_event: Internal changes to get plain-SSL outgoing connections working (as for HTTPS)
Diffstat (limited to 'net')
-rw-r--r--net/server_event.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/server_event.lua b/net/server_event.lua
index 3b05193e..03a7708c 100644
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -143,7 +143,7 @@ do
debug( "new connection failed. id:", self.id, "error:", self.fatalerror )
else
if plainssl and ssl then -- start ssl session
- self:starttls(nil, true)
+ self:starttls(self._sslctx, true)
else -- normal connection
self:_start_session(true)
end
@@ -473,7 +473,7 @@ do
local coroutine_wrap = coroutine.wrap
local socket_gettime = socket.gettime
local coroutine_yield = coroutine.yield
- function handleclient( client, ip, port, server, pattern, listener, _, sslctx ) -- creates an client interface
+ function handleclient( client, ip, port, server, pattern, listener, sslctx ) -- creates an client interface
--vdebug("creating client interfacce...")
local interface = {
type = "client";
@@ -692,7 +692,7 @@ do
end
local client_ip, client_port = client:getpeername( )
interface._connections = interface._connections + 1 -- increase connection count
- local clientinterface = handleclient( client, client_ip, client_port, interface, pattern, listener, nil, sslctx )
+ local clientinterface = handleclient( client, client_ip, client_port, interface, pattern, listener, sslctx )
--vdebug( "client id:", clientinterface, "startssl:", startssl )
if ssl and sslctx then
clientinterface:starttls(sslctx, true)