Merge Tobias->trunk

[prosody.git] / net / httpserver_listener.lua

diff --git a/net/httpserver_listener.lua b/net/httpserver_listener.lua
index 48ade157e12c92665657769e6182313441c311af..dd14b43c9926f845197090edd8be626911757d0b 100644 (file)
--- a/net/httpserver_listener.lua
+++ b/net/httpserver_listener.lua
@@ -1,6 +1,6 @@
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
@@ -16,20 +16,25 @@ 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
+       if data and data ~= "" then
                request_reader(request, 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;