Software / code / prosody
Changeset
7046:6b4232125f32
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 04 Jan 2016 09:09:15 +0000 |
| parents | 7042:20ac6972b9aa (current diff) 7045:49e2456bf2ce (diff) |
| children | 7048:b58fd349ddfe |
| files | net/server_select.lua |
| diffstat | 2 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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 )
--- 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
