Merge with trunk

[prosody.git] / net / httpserver.lua

diff --git a/net/httpserver.lua b/net/httpserver.lua
index 0ed679093a799977c35aa7e4364461b11886faf0..51dca1668a441c58418ae23815f41b41de191ed4 100644 (file)
--- a/net/httpserver.lua
+++ b/net/httpserver.lua
@@ -209,7 +209,7 @@ end
 
 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 @@ function destroy_request(request)
                end
                request.handler.close()
                if request.conn then
-                       listener.disconnect(request.conn, "closed");
+                       listener.ondisconnect(request.handler, "closed");
                end
        end
 end