Merge 0.10->trunk

5 files changed, 30 insertions, 11 deletions

diff --git a/net/adns.lua b/net/adns.lua
index 15814fe7..87f2876b 100644
--- a/net/adns.lua
+++ b/net/adns.lua
@@ -76,12 +76,11 @@ function new_async_socket(sock, resolver)
 
 	handler.settimeout = function () end
 	handler.setsockname = function (_, ...) return sock:setsockname(...); end
-	handler.setpeername = function (_, ...) peername = (...); local ret = sock:setpeername(...); _:set_send(dummy_send); return ret; end
+	handler.setpeername = function (_, ...) peername = (...); local ret, err = sock:setpeername(...); _:set_send(dummy_send); return ret, err; end
 	handler.connect = function (_, ...) return sock:connect(...) end
 	--handler.send = function (_, data) _:write(data);  return _.sendbuffer and _.sendbuffer(); end
 	handler.send = function (_, data)
-		local getpeername = sock.getpeername;
-		log("debug", "Sending DNS query to %s", (getpeername and getpeername(sock)) or "<unconnected>");
+		log("debug", "Sending DNS query to %s", peername);
 		return sock:send(data);
 	end
 	return handler;
diff --git a/net/dns.lua b/net/dns.lua
index 2b03caf6..2cb677f6 100644
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -624,7 +624,7 @@ function resolver:getsocket(servernum)    -- - - - - - - - - - - - - getsocket
 	local sock = self.socket[servernum];
 	if sock then return sock; end
 
-	local err;
+	local ok, err;
 	local peer = self.server[servernum];
 	if peer:find(":") then
 		sock, err = socket.udp6();
@@ -637,10 +637,14 @@ function resolver:getsocket(servernum)    -- - - - - - - - - - - - - getsocket
 	end
 	sock:settimeout(0);
 	-- todo: attempt to use a random port, fallback to 0
-	sock:setsockname('*', 0);
-	sock:setpeername(peer, 53);
 	self.socket[servernum] = sock;
 	self.socketset[sock] = servernum;
+	-- set{sock,peer}name can fail, eg because of local routing table
+	-- if so, try the next server
+	ok, err = sock:setsockname('*', 0);
+	if not ok then return self:servfail(sock, err); end
+	ok, err = sock:setpeername(peer, 53);
+	if not ok then return self:servfail(sock, err); end
 	return sock;
 end
 
@@ -788,13 +792,13 @@ function resolver:query(qname, qtype, qclass)    -- - - - - - - - - - -- query
 	return true;
 end
 
-function resolver:servfail(sock)
+function resolver:servfail(sock, err)
 	-- Resend all queries for this server
 
 	local num = self.socketset[sock]
 
 	-- Socket is dead now
-	self:voidsocket(sock);
+	sock = self:voidsocket(sock);
 
 	-- Find all requests to the down server, and retry on the next server
 	self.time = socket.gettime();
@@ -811,8 +815,8 @@ function resolver:servfail(sock)
 					--print('timeout');
 					queries[question] = nil;
 				else
-					local _a = self:getsocket(o.server);
-					if _a then _a:send(o.packet); end
+					sock, err = self:getsocket(o.server);
+					if sock then sock:send(o.packet); end
 				end
 			end
 		end
@@ -828,6 +832,7 @@ function resolver:servfail(sock)
 			self.best_server = 1;
 		end
 	end
+	return sock, err;
 end
 
 function resolver:settimeout(seconds)
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index 55eb2e55..9185ac1b 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -27,6 +27,7 @@ local set, array = require "util.set", require "util.array";
 local cert_verify_identity = require "util.x509".verify_identity;
 local envload = require "util.envload".envload;
 local envloadfile = require "util.envload".envloadfile;
+local has_pposix, pposix = pcall(require, "util.pposix");
 
 local commands = module:shared("commands")
 local def_env = module:shared("env");
@@ -322,7 +323,7 @@ local function human(kb)
 end
 
 function def_env.server:memory()
-	if not pposix.meminfo then
+	if not has_pposix or not pposix.meminfo then
 		return true, "Lua is using "..collectgarbage("count");
 	end
 	local mem, lua_mem = pposix.meminfo(), collectgarbage("count");
diff --git a/plugins/mod_http.lua b/plugins/mod_http.lua
index 49529ea2..8bda1cac 100644
--- a/plugins/mod_http.lua
+++ b/plugins/mod_http.lua
@@ -45,6 +45,11 @@ local function get_base_path(host_module, app_name, default_app_path)
 		:gsub("%$(%w+)", { host = host_module.host });
 end
 
+local function redir_handler(event)
+	event.response.headers.location = event.request.path.."/";
+	return 301;
+end
+
 local ports_by_scheme = { http = 80, https = 443, };
 
 -- Helper to deduce a module's external URL
@@ -99,6 +104,9 @@ function module.add_host(module)
 						local path = event.request.path:sub(base_path_len);
 						return _handler(event, path);
 					end;
+					module:hook_object_event(server, event_name:sub(1, -3), redir_handler, -1);
+				elseif event_name:sub(-1, -1) == "/" then
+					module:hook_object_event(server, event_name:sub(1, -2), redir_handler, -1);
 				end
 				if not app_handlers[event_name] then
 					app_handlers[event_name] = handler;
diff --git a/util/paths.lua b/util/paths.lua
index 3e5744df..89f4cad9 100644
--- a/util/paths.lua
+++ b/util/paths.lua
@@ -1,3 +1,5 @@
+local t_concat = table.concat;
+
 local path_sep = package.config:sub(1,1);
 
 local path_util = {}
@@ -35,4 +37,8 @@ function path_util.glob_to_pattern(glob)
 	end).."$";
 end
 
+function path_util.join(...)
+	return t_concat({...}, path_sep);
+end
+
 return path_util;