Merge with trunk

[prosody.git] / net / httpserver_listener.lua

diff --git a/net/httpserver_listener.lua b/net/httpserver_listener.lua
index 455191fb39e289daca4b27e1eccdf9fd619495bc..5a261a43cb40e314bf5d735793c1032c7728d590 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
@@ -34,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;