Merge with trunk

[prosody.git] / net / httpclient_listener.lua

diff --git a/net/httpclient_listener.lua b/net/httpclient_listener.lua
index 69b7946b9f1441ee6dd123a65116e784e45059da..6517de442f9e90aad7d8abb4914cad433847c16d 100644 (file)
--- a/net/httpclient_listener.lua
+++ b/net/httpclient_listener.lua
@@ -15,7 +15,7 @@ local buffers = {}; -- Buffers of partial lines
 
 local httpclient = { default_port = 80, default_mode = "*a" };
 
-function httpclient.listener(conn, data)
+function httpclient.onincoming(conn, data)
        local request = requests[conn];
 
        if not request then
@@ -28,7 +28,7 @@ function httpclient.listener(conn, data)
        end
 end
 
-function httpclient.disconnect(conn, err)
+function httpclient.ondisconnect(conn, err)
        local request = requests[conn];
        if request then
                request:reader(nil);