Merge with trunk

[prosody.git] / net / httpserver.lua

diff --git a/net/httpserver.lua b/net/httpserver.lua
index 3a54fd627347220fee32eda69d7d4ed04d3c4924..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
@@ -278,7 +278,9 @@ function new_from_config(ports, handle_request, default_options)
                        ssl.protocol = "sslv23";
                end
                
-               new{ port = port, base = base, handler = handle_request, ssl = ssl, type = (ssl and "ssl") or "tcp" }
+               new{ port = port, interface = interface, 
+                       base = base, handler = handle_request, 
+                       ssl = ssl, type = (ssl and "ssl") or "tcp" };
        end
 end