diff -r 9e69aecad25e -r 8a16c5e92bcb net/httpserver.lua
--- a/net/httpserver.lua	Mon Feb 08 11:20:19 2010 +0000
+++ b/net/httpserver.lua	Mon Feb 08 11:22:21 2010 +0000
@@ -214,7 +214,7 @@
 
 
 function new_request(handler)
-	return { handler = handler, conn = handler.socket,
+	return { handler = handler, conn = handler,
 			write = function (...) return handler:write(...); end, state = "request",
 			server = http_servers[handler:serverport()],
 			send = send_response,
@@ -236,7 +236,7 @@
 		end
 		request.handler:close()
 		if request.conn then
-			listener.ondisconnect(request.handler, "closed");
+			listener.ondisconnect(request.conn, "closed");
 		end
 	end
 end