Diff

net/httpserver.lua @ 2281:27441b099984

Merge with tip.
author Tobias Markmann <tm@ayena.de>
date Sun, 29 Nov 2009 21:33:37 +0100 (2009-11-29)
parent 2130:828e161cdfc7
child 2274:6241da17f48d
line wrap: on
line diff
--- a/net/httpserver.lua	Sun Nov 29 21:32:39 2009 +0100
+++ b/net/httpserver.lua	Sun Nov 29 21:33:37 2009 +0100
@@ -209,7 +209,7 @@
 
 function new_request(handler)
 	return { handler = handler, conn = handler.socket, 
-			write = handler.write, state = "request", 
+			write = function (...) return handler:write(...); end, state = "request", 
 			server = http_servers[handler.serverport()],
 			send = send_response,
 			destroy = destroy_request,
@@ -230,7 +230,7 @@
 		end
 		request.handler.close()
 		if request.conn then
-			listener.disconnect(request.handler, "closed");
+			listener.ondisconnect(request.handler, "closed");
 		end
 	end
 end