# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1451898555 0
# Node ID 6b4232125f3202ceb7d25d083b1727c96d8a0c71
# Parent  20ac6972b9aab837972813e40a93b2cac6deadc5# Parent  49e2456bf2cef770f206867d093d28533e8c5cfd
Merge 0.10->trunk

diff -r 20ac6972b9aa -r 6b4232125f32 net/server_select.lua
--- a/net/server_select.lua	Sat Jan 02 20:42:53 2016 +0000
+++ b/net/server_select.lua	Mon Jan 04 09:09:15 2016 +0000
@@ -580,8 +580,9 @@
 						coroutine_yield( ) -- handshake not finished
 					end
 				end
-				out_put( "server.lua: ssl handshake error: ", tostring(err or "handshake too long") )
-				_ = handler and handler:force_close("ssl handshake failed")
+				err = "ssl handshake error: " .. ( err or "handshake too long" );
+				out_put( "server.lua: ", err );
+				_ = handler and handler:force_close(err)
 				return false, err -- handshake failed
 			end
 		)
diff -r 20ac6972b9aa -r 6b4232125f32 plugins/mod_admin_adhoc.lua
--- a/plugins/mod_admin_adhoc.lua	Sat Jan 02 20:42:53 2016 +0000
+++ b/plugins/mod_admin_adhoc.lua	Mon Jan 04 09:09:15 2016 +0000
@@ -390,7 +390,7 @@
 		flags[#flags+1] = "encrypted";
 	end
 	if session.compressed then
-		flags[#flags+1] = "compressed)";
+		flags[#flags+1] = "compressed";
 	end
 	if session.smacks then
 		flags[#flags+1] = "sm";
@@ -422,7 +422,7 @@
 		local sess_lines = { r = remotehost,
 			session_flags(session, { "", direction, remotehost or "?" })};
 
-		if remotehost:match(module_host) or localhost:match(module_host) then
+		if localhost == module_host then
 			s2s_list[#s2s_list+1] = sess_lines;
 		end
 	end