# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1247422634 -3600
# Node ID e5d5f864c12544be1e53087364a14c4fedce1f88
# Parent  30ebb38573b7c8e8e5f99195a97e570fbb21ca11# Parent  591732da13069f5d213915e031eb8a5a450c6f6c
Merge with 0.5

diff -r 30ebb38573b7 -r e5d5f864c125 net/httpserver_listener.lua
--- a/net/httpserver_listener.lua	Sun Jul 12 15:23:39 2009 +0100
+++ b/net/httpserver_listener.lua	Sun Jul 12 19:17:14 2009 +0100
@@ -22,6 +22,11 @@
 	if not request then
 		request = new_request(conn);
 		requests[conn] = request;
+		
+		-- If using HTTPS, request is secure
+		if conn.ssl() then
+			request.secure = true;
+		end
 	end
 
 	if data then
diff -r 30ebb38573b7 -r e5d5f864c125 plugins/mod_bosh.lua
--- a/plugins/mod_bosh.lua	Sun Jul 12 15:23:39 2009 +0100
+++ b/plugins/mod_bosh.lua	Sun Jul 12 19:17:14 2009 +0100
@@ -147,7 +147,7 @@
 		local session = { type = "c2s_unauthed", conn = {}, sid = sid, rid = attr.rid, host = attr.to, bosh_version = attr.ver, bosh_wait = attr.wait, streamid = sid, 
 						bosh_hold = BOSH_DEFAULT_HOLD, bosh_max_inactive = BOSH_DEFAULT_INACTIVITY,
 						requests = { }, send_buffer = {}, reset_stream = bosh_reset_stream, close = bosh_close_stream, 
-						dispatch_stanza = core_process_stanza, log = logger.init("bosh"..sid) };
+						dispatch_stanza = core_process_stanza, log = logger.init("bosh"..sid), secure = request.secure };
 		sessions[sid] = session;
 		
 		log("info", "New BOSH session, assigned it sid '%s'", sid);