# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1253540549 -3600
# Node ID c55e06eb53b24aba610a3f514bcd482d83112221
# Parent  7fef8649d0f688e75eba829db5492fd87fd9abb5# Parent  7e41ad68fe3c16943ce6ccd72b7e904c34668ce2
Merge with 0.5

diff -r 7fef8649d0f6 -r c55e06eb53b2 core/s2smanager.lua
--- a/core/s2smanager.lua	Sun Sep 20 21:30:20 2009 +0100
+++ b/core/s2smanager.lua	Mon Sep 21 14:42:29 2009 +0100
@@ -41,6 +41,7 @@
 
 local connect_timeout = config.get("*", "core", "s2s_timeout") or 60;
 local dns_timeout = config.get("*", "core", "dns_timeout") or 60;
+local max_dns_depth = config.get("*", "core", "dns_max_depth") or 3;
 
 incoming_s2s = {};
 local incoming_s2s = incoming_s2s;
@@ -255,9 +256,12 @@
 		
 		-- COMPAT: This is a compromise for all you CNAME-(ab)users :)
 		if not (reply and reply[1] and reply[1].a) then
+			local count = max_dns_depth;
 			reply = dns.peek(connect_host, "CNAME", "IN");
-			while reply and reply[1] and not reply[1].a and reply[1].cname do
+			while count > 0 and reply and reply[1] and not reply[1].a and reply[1].cname do
+				log("debug", "Looking up %s (DNS depth is %d)", tostring(reply[1].cname), count);
 				reply = dns.peek(reply[1].cname, "A", "IN") or dns.peek(reply[1].cname, "CNAME", "IN");
+				count = count - 1;
 			end
 		end
 		-- end of CNAME resolving
diff -r 7fef8649d0f6 -r c55e06eb53b2 net/dns.lua
--- a/net/dns.lua	Sun Sep 20 21:30:20 2009 +0100
+++ b/net/dns.lua	Mon Sep 21 14:42:29 2009 +0100
@@ -504,6 +504,7 @@
 
 
 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
diff -r 7fef8649d0f6 -r c55e06eb53b2 net/server.lua
--- a/net/server.lua	Sun Sep 20 21:30:20 2009 +0100
+++ b/net/server.lua	Mon Sep 21 14:42:29 2009 +0100
@@ -363,6 +363,7 @@
                 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 )