# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1243603733 -3600
# Node ID de66fa750daff49283e13bac2df89a6c8174950f
# Parent  3be23cf5a659eeaf64c1f03f1e599b3f425b6028
sessionmanager, mod_tls: Mark a session as secure when TLS is active

diff -r 3be23cf5a659 -r de66fa750daf core/sessionmanager.lua
--- a/core/sessionmanager.lua	Thu May 28 20:39:32 2009 +0100
+++ b/core/sessionmanager.lua	Fri May 29 14:28:53 2009 +0100
@@ -171,6 +171,12 @@
 		session:close{ condition = "host-unknown", text = "This server does not serve "..tostring(session.host)};
 		return;
 	end
+	
+	-- If session.secure is *false* (not nil) then it means we /were/ encrypting
+	-- since we now have a new stream header, session is secured
+	if session.secure == false then
+		session.secure = true;
+	end
 						
 	local features = st.stanza("stream:features");
 	fire_event("stream-features", session, features);
diff -r 3be23cf5a659 -r de66fa750daf plugins/mod_tls.lua
--- a/plugins/mod_tls.lua	Thu May 28 20:39:32 2009 +0100
+++ b/plugins/mod_tls.lua	Fri May 29 14:28:53 2009 +0100
@@ -19,6 +19,7 @@
 				session:reset_stream();
 				session.conn.starttls();
 				session.log("info", "TLS negotiation started...");
+				session.secure = false;
 			else
 				-- FIXME: What reply?
 				session.log("warn", "Attempt to start TLS, but TLS is not available on this connection");