net.dns: Support for resolving AAAA records

[prosody.git] / net / httpserver_listener.lua

diff --git a/net/httpserver_listener.lua b/net/httpserver_listener.lua
index f673de77904d6148f02333e72619a42e9b5a8805..dd14b43c9926f845197090edd8be626911757d0b 100644 (file)
--- a/net/httpserver_listener.lua
+++ b/net/httpserver_listener.lua
@@ -16,7 +16,7 @@ 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
@@ -24,17 +24,17 @@ function httpserver.listener(conn, data)
                requests[conn] = request;
                
                -- If using HTTPS, request is secure
-               if conn.ssl() then
+               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;