net.dns: Support for resolving AAAA records

[prosody.git] / net / server_select.lua

diff --git a/net/server_select.lua b/net/server_select.lua
index a7081f8148e7b3122eb11e2a9f5b103c7039e2cf..13a910f8b4ce52a963b4d54f3067d621415c3c56 100644 (file)
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@ -32,6 +32,7 @@ local STAT_UNIT = 1 -- byte
 local type = use "type"
 local pairs = use "pairs"
 local ipairs = use "ipairs"
+local tonumber = use "tonumber"
 local tostring = use "tostring"
 local collectgarbage = use "collectgarbage"
 
@@ -76,6 +77,7 @@ local stats
 local idfalse
 local addtimer
 local closeall
+local addsocket
 local addserver
 local getserver
 local wrapserver
@@ -127,6 +129,8 @@ local _timer
 
 local _maxclientsperserver
 
+local _maxsslhandshake
+
 ----------------------------------// DEFINITION //--
 
 _server = { } -- key = port, value = table; list of listening servers
@@ -526,7 +530,6 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
                                                _readlistlen = addsocket(_readlist, client, _readlistlen)
                                                return true
                                        else
-                                               out_put( "server.lua: error during ssl handshake: ", tostring(err) )
                                                if err == "wantwrite" and not wrote then
                                                        _sendlistlen = addsocket(_sendlist, client, _sendlistlen)
                                                        wrote = true
@@ -534,6 +537,7 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
                                                        _readlistlen = addsocket(_readlist, client, _readlistlen)
                                                        read = true
                                                else
+                                                       out_put( "server.lua: ssl handshake error: ", tostring(err) )
                                                        break;
                                                end
                                                --coroutine_yield( handler, nil, err )   -- handshake not finished
@@ -935,6 +939,7 @@ return {
        
        loop = loop,
        link = link,
+       step = step,
        stats = stats,
        closeall = closeall,
        addtimer = addtimer,