aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-07-12 19:17:14 +0100
committerMatthew Wild <mwild1@gmail.com>2009-07-12 19:17:14 +0100
commitd9d11e5d9ca5c7ae51e4a2d5960a5adaac37f228 (patch)
tree469e767006c3e3b73dde626bd5c95105b611a875 /net
parentc4841e0e92a8cce97c5fc3e689808aa4d63dc35a (diff)
parentf0ac98b7892e16b50e7f6bbb66b128cf55266c0b (diff)
downloadprosody-d9d11e5d9ca5c7ae51e4a2d5960a5adaac37f228.tar.gz
prosody-d9d11e5d9ca5c7ae51e4a2d5960a5adaac37f228.zip
Merge with 0.5
Diffstat (limited to 'net')
-rw-r--r--net/httpserver_listener.lua5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/httpserver_listener.lua b/net/httpserver_listener.lua
index 48ade157..455191fb 100644
--- a/net/httpserver_listener.lua
+++ b/net/httpserver_listener.lua
@@ -22,6 +22,11 @@ function httpserver.listener(conn, data)
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