Merge with trunk

[prosody.git] / net / httpclient_listener.lua

diff --git a/net/httpclient_listener.lua b/net/httpclient_listener.lua
index a648743fb348dfff30f08173e6c8a072028125e8..6517de442f9e90aad7d8abb4914cad433847c16d 100644 (file)
--- a/net/httpclient_listener.lua
+++ b/net/httpclient_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 log = require "util.logger".init("httpclient_listener");
 
 local connlisteners_register = require "net.connlisteners".register;
@@ -7,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
@@ -20,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);