aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/dns.lua8
-rw-r--r--net/httpserver_listener.lua2
-rw-r--r--net/server_event.lua20
3 files changed, 18 insertions, 12 deletions
diff --git a/net/dns.lua b/net/dns.lua
index 8855cc61..c0de97fd 100644
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -851,7 +851,13 @@ end
function resolver:lookup(qname, qtype, qclass) -- - - - - - - - - - lookup
self:query (qname, qtype, qclass)
- while self:pulse() do socket.select(self.socket, nil, 4); end
+ while self:pulse() do
+ local recvt = {}
+ for i, s in ipairs(self.socket) do
+ recvt[i] = s
+ end
+ socket.select(recvt, nil, 4)
+ end
--print(self.cache);
return self:peek(qname, qtype, qclass);
end
diff --git a/net/httpserver_listener.lua b/net/httpserver_listener.lua
index 84016033..dd14b43c 100644
--- a/net/httpserver_listener.lua
+++ b/net/httpserver_listener.lua
@@ -29,7 +29,7 @@ function httpserver.onincoming(conn, data)
end
end
- if data then
+ if data and data ~= "" then
request_reader(request, data);
end
end
diff --git a/net/server_event.lua b/net/server_event.lua
index 43e70a0f..0331e793 100644
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -20,8 +20,8 @@ local LAST_MODIFIED = "2009/11/20"
local cfg = {
MAX_CONNECTIONS = 100000, -- max per server connections (use "ulimit -n" on *nix)
- MAX_HANDSHAKE_ATTEMPS = 1000, -- attempts to finish ssl handshake
- HANDSHAKE_TIMEOUT = 60, -- timout in seconds per handshake attempt
+ MAX_HANDSHAKE_ATTEMPTS= 1000, -- attempts to finish ssl handshake
+ HANDSHAKE_TIMEOUT = 60, -- timeout in seconds per handshake attempt
MAX_READ_LENGTH = 1024 * 1024 * 1024 * 1024, -- max bytes allowed to read from sockets
MAX_SEND_LENGTH = 1024 * 1024 * 1024 * 1024, -- max bytes size of write buffer (for writing on sockets)
ACCEPT_DELAY = 10, -- seconds to wait until the next attempt of a full server to accept
@@ -136,7 +136,7 @@ do
function interface_mt:_start_connection(plainssl) -- should be called from addclient
local callback = function( event )
- if EV_TIMEOUT == event then -- timout during connection
+ if EV_TIMEOUT == event then -- timeout during connection
self.fatalerror = "connection timeout"
self:ontimeout() -- call timeout listener
self:_close()
@@ -196,12 +196,12 @@ do
function( event )
local _, err
local attempt = 0
- local maxattempt = cfg.MAX_HANDSHAKE_ATTEMPS
+ local maxattempt = cfg.MAX_HANDSHAKE_ATTEMPTS
while attempt < maxattempt do -- no endless loop
attempt = attempt + 1
- debug( "ssl handshake of client with id:"..tostring(self).."attemp:"..attempt )
+ debug( "ssl handshake of client with id:"..tostring(self)..", attempt:"..attempt )
if attempt > maxattempt then
- self.fatalerror = "max handshake attemps exceeded"
+ self.fatalerror = "max handshake attempts exceeded"
elseif EV_TIMEOUT == event then
self.fatalerror = "timeout during handshake"
else
@@ -570,7 +570,7 @@ do
return -1;
end
interface.eventwritetimeout = addevent( base, nil, EV_TIMEOUT, callback, cfg.WRITE_TIMEOUT ) -- reg a new timeout event
- debug( "wantread during write attemp, reg it in readcallback but dont know what really happens next..." )
+ debug( "wantread during write attempt, reg it in readcallback but dont know what really happens next..." )
-- hopefully this works with luasec; its simply not possible to use 2 different write events on a socket in luaevent
return -1
end
@@ -631,7 +631,7 @@ do
interface:_close()
end, cfg.READ_TIMEOUT
)
- debug( "wantwrite during read attemp, reg it in writecallback but dont know what really happens next..." )
+ debug( "wantwrite during read attempt, reg it in writecallback but dont know what really happens next..." )
-- to be honest i dont know what happens next, if it is allowed to first read, the write etc...
else -- connection was closed or fatal error
interface.fatalerror = err
@@ -693,7 +693,7 @@ do
if interface._connections >= cfg.MAX_CONNECTIONS then
client:close( ) -- refuse connection
debug( "maximal connections reached, refuse client connection; accept delay:", delay )
- return EV_TIMEOUT, delay -- delay for next accept attemp
+ return EV_TIMEOUT, delay -- delay for next accept attempt
end
local client_ip, client_port = client:getpeername( )
interface._connections = interface._connections + 1 -- increase connection count
@@ -750,7 +750,7 @@ do
function wrapclient( client, ip, port, listeners, pattern, sslctx, startssl )
local interface = handleclient( client, ip, port, nil, pattern, listeners, sslctx )
interface:_start_session()
- return interface
+ return interface, client
--function handleclient( client, ip, port, server, pattern, listener, _, sslctx ) -- creates an client interface
end