mod_saslauth: Don't print raw SASL data to avoid logging passwords unnecessarily

[prosody.git] / net / http.lua

diff --git a/net/http.lua b/net/http.lua
index 10d966310377d7e54912ab9b81378b99e3bf5ec4..34ec11b4f4ca45fc7493d2ae08745f5fbda76057 100644 (file)
--- a/net/http.lua
+++ b/net/http.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local socket = require "socket"
 local mime = require "mime"
@@ -144,7 +152,7 @@ function request(u, ex, callback)
        end
        
        req.handler, req.conn = server.wrapclient(socket.tcp(), req.host, req.port or 80, listener, "*a");
-       req.write = req.handler.write;
+       req.write = function (...) return req.handler:write(...); end
        req.conn:settimeout(0);
        local ok, err = req.conn:connect(req.host, req.port or 80);
        if not ok and err ~= "timeout" then
@@ -192,7 +200,7 @@ end
 function destroy_request(request)
        if request.conn then
                request.handler.close()
-               listener.disconnect(request.conn, "closed");
+               listener.ondisconnect(request.conn, "closed");
        end
 end