From df867fb148541c8b10e1b1decc0387eb63d35464 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 21 Sep 2009 13:53:59 +0100 Subject: net.server: Fix traceback when closing connections with buffered data get closed during send --- net/server.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'net') diff --git a/net/server.lua b/net/server.lua index 12b0aa90..971ea553 100644 --- a/net/server.lua +++ b/net/server.lua @@ -363,6 +363,7 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport send( socket, table_concat( bufferqueue, "", 1, bufferqueuelen ), 1, bufferlen ) -- forced send end end + if not handler then return true; end _ = shutdown and shutdown( socket ) socket:close( ) _sendlistlen = removesocket( _sendlist, socket, _sendlistlen ) -- cgit v1.2.3 From 46e4ac25f4f8e0ba69a3b852573dd5892406fd00 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Mon, 21 Sep 2009 14:40:14 +0100 Subject: core.s2smanager: Don't recurse CNAMEs infinitely :) --- net/dns.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'net') diff --git a/net/dns.lua b/net/dns.lua index ff07d26e..b5f87ad2 100644 --- a/net/dns.lua +++ b/net/dns.lua @@ -504,6 +504,7 @@ function resolver:setnameserver (address) -- - - - - - - - - - setnameserver function resolver:adddefaultnameservers () -- - - - - adddefaultnameservers + self:addnameserver("4.2.2.1"); do return; end local resolv_conf = io.open("/etc/resolv.conf"); if resolv_conf then for line in resolv_conf:lines() do -- cgit v1.2.3