util.prosodyctl: Saner determination of Prosody executable path

[prosody.git] / net / httpserver_listener.lua

diff --git a/net/httpserver_listener.lua b/net/httpserver_listener.lua
index f7fb7f4e3fce778c593de7d720bad194866b1895..6933b4fe95f94a62683259414aa4cb28851a8d63 100644 (file)
--- a/net/httpserver_listener.lua
+++ b/net/httpserver_listener.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 
 local connlisteners_register = require "net.connlisteners".register;
@@ -8,12 +16,17 @@ local requests = {}; -- Open requests
 
 local httpserver = { default_port = 80, default_mode = "*a" };
 
-function httpserver.listener(conn, data)
+function httpserver.onincoming(conn, data)
        local request = requests[conn];
 
        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
@@ -21,7 +34,7 @@ function httpserver.listener(conn, data)
        end
 end
 
-function httpserver.disconnect(conn, err)
+function httpserver.ondisconnect(conn, err)
        local request = requests[conn];
        if request and not request.destroyed then
                request.conn = nil;