diff -r f107f0205793 -r fcdcdf00787c net/httpserver_listener.lua
--- a/net/httpserver_listener.lua	Sun Nov 22 04:42:47 2009 +0000
+++ b/net/httpserver_listener.lua	Sun Nov 22 04:43:46 2009 +0000
@@ -16,7 +16,7 @@
 
 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 @@
 	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;